1065494 - Put the new tablet UI behind a build flag

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Lucas Rocha (:lucasr)]

To avoid letting unused code ride the trains. Even though the new UI will land pref'd off in m-c, we unconditionally ship the new resources/code in the APK right now.

Comment 1

[Lucas Rocha (:lucasr)]

Attachment: Put the new tablet UI behind a build flag (r=nalexander)

Comment 2

[Lucas Rocha (:lucasr)]

Comment on attachment 8498134 [details] [diff] [review]
Put the new tablet UI behind a build flag (r=nalexander)

This is not a complete solution (a few classes/resources still ship a build with new tablet UI disabled) but I consider this good enough as a temporary setup. This patches ensures new tablet resources and tab strip classes are not included in the APK when the build flag is disabled. I had to keep a couple of classes in because they're used in common code, namely BrowserToolbarNewTablet and TabsGridLayout.

To be clear: the new tablet UI is still disabled by default even when new tablet build flag is enabled.

ps: This also fixes some remaining issues related to bug 1073474.

Comment 3

[Richard Newman [:rnewman]]

Comment on attachment 8498134 [details] [diff] [review]
Put the new tablet UI behind a build flag (r=nalexander)

Review of attachment 8498134 [details] [diff] [review]:
-----------------------------------------------------------------

::: configure.in
@@ +4896,5 @@
>      AC_DEFINE(MOZ_ANDROID_SHARE_OVERLAY)
>  fi
>  
>  dnl ========================================================
> +dnl = Include New Tablet UI on Android

I'd probably comment that this is not long for this world.

Comment 4

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8498134 [details] [diff] [review]
Put the new tablet UI behind a build flag (r=nalexander)

Review of attachment 8498134 [details] [diff] [review]:
-----------------------------------------------------------------

Looks fine to me.

::: configure.in
@@ +4897,5 @@
>  fi
>  
>  dnl ========================================================
> +dnl = Include New Tablet UI on Android
> +dnl ========================================================

Yeah, calling something /new/ has a tendency to drift.  Can we call it tablet-UI-on-top or tablet2 or anything else?  If you're 100% sure this dies quickly, roll on.

::: mobile/android/base/moz.build
@@ +516,5 @@
> +        'tabs/TabStripAdapter.java',
> +        'tabs/TabStripItemView.java',
> +        'tabs/TabStripView.java'
> +    ]
> +    ANDROID_RES_DIRS += [ SRCDIR + '/newtablet/res' ]

Urgh, newtablet?  Also, this will need care to integrate into Eclipse correctly.  I can help with this, but please file a ticket.

::: mobile/android/confvars.sh
@@ +80,5 @@
>  else
>    MOZ_ANDROID_SEARCH_ACTIVITY=
>  fi
>  
> +# Enable the new tablet UI in pre-release builds

Just double-checking: pre-release == {Nightly, Aurora}; and that's what you want.

Comment 5

[Lucas Rocha (:lucasr)]

(In reply to Nick Alexander :nalexander from comment #4)
> Comment on attachment 8498134 [details] [diff] [review]
> Put the new tablet UI behind a build flag (r=nalexander)
> 
> Review of attachment 8498134 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> Looks fine to me.
> 
> ::: configure.in
> @@ +4897,5 @@
> >  fi
> >  
> >  dnl ========================================================
> > +dnl = Include New Tablet UI on Android
> > +dnl ========================================================
> 
> Yeah, calling something /new/ has a tendency to drift.  Can we call it
> tablet-UI-on-top or tablet2 or anything else?  If you're 100% sure this dies
> quickly, roll on.

As I explained on IRC, the newtablet directories and resource names are just a mechanism to allow us to have both current and new tablet UIs in parallel. We'll do a mass rename/move of new tablet resources and classes once we make it official in Nightly. 

> ::: mobile/android/base/moz.build
> @@ +516,5 @@
> > +        'tabs/TabStripAdapter.java',
> > +        'tabs/TabStripItemView.java',
> > +        'tabs/TabStripView.java'
> > +    ]
> > +    ANDROID_RES_DIRS += [ SRCDIR + '/newtablet/res' ]
> 
> Urgh, newtablet?  Also, this will need care to integrate into Eclipse
> correctly.  I can help with this, but please file a ticket.

Filed bug 1075797.

> ::: mobile/android/confvars.sh
> @@ +80,5 @@
> >  else
> >    MOZ_ANDROID_SEARCH_ACTIVITY=
> >  fi
> >  
> > +# Enable the new tablet UI in pre-release builds
> 
> Just double-checking: pre-release == {Nightly, Aurora}; and that's what you
> want.

Not entirely sure, to be honest. I think I'll make it Nightly only just in case. Thanks for pointing this out.

Comment 6

[Lucas Rocha (:lucasr)]

(In reply to Richard Newman [:rnewman] from comment #3)
> Comment on attachment 8498134 [details] [diff] [review]
> Put the new tablet UI behind a build flag (r=nalexander)
> 
> Review of attachment 8498134 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: configure.in
> @@ +4896,5 @@
> >      AC_DEFINE(MOZ_ANDROID_SHARE_OVERLAY)
> >  fi
> >  
> >  dnl ========================================================
> > +dnl = Include New Tablet UI on Android
> 
> I'd probably comment that this is not long for this world.

Done.

Comment 7

[Lucas Rocha (:lucasr)]

Decided to keep this in Nightly & Aurora after discussing this with mfinkle.

https://hg.mozilla.org/integration/fx-team/rev/21f27ccab222

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/21f27ccab222