author | Michael Comella <michael.l.comella@gmail.com> |
Fri, 03 Apr 2015 15:45:49 -0700 | |
changeset 237636 | f1da7543f55152c7780f1da67ba7827f651f4434 |
parent 237635 | 61da0ee2db1f5f6aaac786ab9915ed33b10d28ae |
child 237637 | fa5c609b29426c40ef54024f954ea14d2768963b |
push id | 28541 |
push user | philringnalda@gmail.com |
push date | Sat, 04 Apr 2015 17:54:27 +0000 |
treeherder | mozilla-central@eeb9438975a5 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | liuche |
bugs | 1151089 |
milestone | 40.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/base/overlays/ui/ShareDialog.java +++ b/mobile/android/base/overlays/ui/ShareDialog.java @@ -165,17 +165,16 @@ public class ShareDialog extends Locales toast.show(); finish(); } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getWindow().setWindowAnimations(0); setContentView(R.layout.overlay_share_dialog); LocalBroadcastManager.getInstance(this).registerReceiver(uiEventListener, new IntentFilter(OverlayConstants.SHARE_METHOD_UI_EVENT)); // Send tab. sendTabList = (SendTabList) findViewById(R.id.overlay_send_tab_btn); @@ -249,16 +248,21 @@ public class ShareDialog extends Locales } // Have the service start any initialisation work that's necessary for us to show the correct // UI. The results of such work will come in via the BroadcastListener. Intent serviceStartupIntent = new Intent(this, OverlayActionService.class); serviceStartupIntent.setAction(OverlayConstants.ACTION_PREPARE_SHARE); startService(serviceStartupIntent); + // Start the slide-up animation. + getWindow().setWindowAnimations(0); + final Animation anim = AnimationUtils.loadAnimation(this, R.anim.overlay_slide_up); + findViewById(R.id.sharedialog).startAnimation(anim); + // If provided, we use the subject text to give us something nice to display. // If not, we wing it with the URL. // TODO: Consider polling Fennec databases to find better information to display. final String subjectText = intent.getStringExtra(Intent.EXTRA_SUBJECT); final String telemetryExtras = "title=" + (subjectText != null); if (subjectText != null) { @@ -301,20 +305,16 @@ public class ShareDialog extends Locales } }; titleView.setOnClickListener(launchBrowser); subtitleView.setOnClickListener(launchBrowser); final LocalBrowserDB browserDB = new LocalBrowserDB(getCurrentProfile()); setButtonState(url, browserDB); - - // Start the slide-up animation. - final Animation anim = AnimationUtils.loadAnimation(this, R.anim.overlay_slide_up); - findViewById(R.id.sharedialog).startAnimation(anim); } @Override protected void onNewIntent(final Intent intent) { super.onNewIntent(intent); // The intent returned by getIntent is not updated automatically. setIntent(intent);