diff options
author | Tarun Nainani <tnainani@codeaurora.org> | 2015-04-29 15:33:45 -0700 |
---|---|---|
committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-08-28 13:15:47 +0200 |
commit | 32bc29c4ae832cbe42091242da00fc63ff38fd9e (patch) | |
tree | fef87b7f62d9af907a5a2b0d43307937f7f11e7c /src | |
parent | ae3b179924609963b301a1b5dc685d78c67f341f (diff) | |
download | android_packages_apps_Gello-32bc29c4ae832cbe42091242da00fc63ff38fd9e.tar.gz android_packages_apps_Gello-32bc29c4ae832cbe42091242da00fc63ff38fd9e.tar.bz2 android_packages_apps_Gello-32bc29c4ae832cbe42091242da00fc63ff38fd9e.zip |
Fix voice search
Use BaseUI implementation of onStateChanged. This was regression
brought by navigation bar cleanup code with changed id
'Change-Id: Iecb699a3e5eb848db149705a9142f8f199f02c04'
Change-Id: I10c69b5d168e03ffb3fd9767bd17d5374e167d34
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/browser/ActivityController.java | 4 | ||||
-rw-r--r-- | src/com/android/browser/BrowserActivity.java | 8 | ||||
-rw-r--r-- | src/com/android/browser/Controller.java | 79 | ||||
-rw-r--r-- | src/com/android/browser/NavigationBarPhone.java | 7 | ||||
-rw-r--r-- | src/com/android/browser/stub/NullController.java | 8 |
5 files changed, 66 insertions, 40 deletions
diff --git a/src/com/android/browser/ActivityController.java b/src/com/android/browser/ActivityController.java index 817857ac..d19eaaca 100644 --- a/src/com/android/browser/ActivityController.java +++ b/src/com/android/browser/ActivityController.java @@ -21,6 +21,10 @@ public interface ActivityController { void handleNewIntent(Intent intent); + void onStart(); + + void onStop(); + void onResume(); boolean onMenuOpened(int featureId, Menu menu); diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index b07cca56..af2fbfa0 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -229,11 +229,11 @@ public class BrowserActivity extends Activity { } protected void handleOnResume() { - // Note: Intentionally left blank. + mController.onResume(); } protected void handleOnStart() { - mController.onResume(); + mController.onStart(); } @Override @@ -246,7 +246,7 @@ public class BrowserActivity extends Activity { protected void handleOnStop() { CookieManager.getInstance().flushCookieStore(); - mController.onPause(); + mController.onStop(); } @Override @@ -290,7 +290,7 @@ public class BrowserActivity extends Activity { } protected void handleOnPause() { - // Note: Intentionally left blank + mController.onPause(); } @Override diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 8c88c7d2..3be1ab9a 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -238,6 +238,7 @@ public class Controller private boolean mExtendedMenuOpen; private boolean mActivityPaused = true; + private boolean mActivityStopped = true; private boolean mLoadStopped; private Handler mHandler; @@ -730,24 +731,7 @@ public class Controller return; } mActivityPaused = true; - Tab tab = mTabControl.getCurrentTab(); - if (tab != null) { - tab.pause(); - if (!pauseWebViewTimers(tab)) { - if (mWakeLock == null) { - PowerManager pm = (PowerManager) mActivity - .getSystemService(Context.POWER_SERVICE); - mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Browser"); - } - mWakeLock.acquire(); - mHandler.sendMessageDelayed(mHandler - .obtainMessage(RELEASE_WAKELOCK), WAKELOCK_TIMEOUT); - } - } - mUi.onPause(); - mNetworkHandler.onPause(); - NfcHandler.unregister(mActivity); - mActivity.unregisterReceiver(mLowPowerReceiver); + } @Override @@ -777,9 +761,56 @@ public class Controller Log.e(LOGTAG, "BrowserActivity is already resumed."); return; } + mActivityPaused = false; + if (mVoiceResult != null) { + mUi.onVoiceResult(mVoiceResult); + mVoiceResult = null; + } + } + + private void releaseWakeLock() { + if (mWakeLock != null && mWakeLock.isHeld()) { + mHandler.removeMessages(RELEASE_WAKELOCK); + mWakeLock.release(); + } + } + + @Override + public void onStop() { + if (mActivityStopped) { + Log.e(LOGTAG, "BrowserActivity is already stoped."); + return; + } + mActivityStopped = true; + Tab tab = mTabControl.getCurrentTab(); + if (tab != null) { + tab.pause(); + if (!pauseWebViewTimers(tab)) { + if (mWakeLock == null) { + PowerManager pm = (PowerManager) mActivity + .getSystemService(Context.POWER_SERVICE); + mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Browser"); + } + mWakeLock.acquire(); + mHandler.sendMessageDelayed(mHandler + .obtainMessage(RELEASE_WAKELOCK), WAKELOCK_TIMEOUT); + } + } + mUi.onPause(); + mNetworkHandler.onPause(); + NfcHandler.unregister(mActivity); + mActivity.unregisterReceiver(mLowPowerReceiver); + } + + @Override + public void onStart() { + if (!mActivityStopped) { + Log.e(LOGTAG, "BrowserActivity is already started."); + return; + } + mActivityStopped = false; UpdateNotificationService.updateCheck(mActivity); mSettings.setLastRunPaused(false); - mActivityPaused = false; Tab current = mTabControl.getCurrentTab(); if (current != null) { current.resume(); @@ -790,20 +821,10 @@ public class Controller mUi.onResume(); mNetworkHandler.onResume(); NfcHandler.register(mActivity, this); - if (mVoiceResult != null) { - mUi.onVoiceResult(mVoiceResult); - mVoiceResult = null; - } if (current != null && current.getWebView().isShowingCrashView()) current.getWebView().reload(); mActivity.registerReceiver(mLowPowerReceiver, new IntentFilter(Intent.ACTION_BATTERY_LOW)); - } - private void releaseWakeLock() { - if (mWakeLock != null && mWakeLock.isHeld()) { - mHandler.removeMessages(RELEASE_WAKELOCK); - mWakeLock.release(); - } } /** diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java index a94cabd6..23df7fce 100644 --- a/src/com/android/browser/NavigationBarPhone.java +++ b/src/com/android/browser/NavigationBarPhone.java @@ -141,15 +141,8 @@ public class NavigationBarPhone extends NavigationBarBase implements StateListen mTabText.setVisibility(View.VISIBLE); break; case StateListener.STATE_HIGHLIGHTED: - if (!mUrlInput.getText().toString().equals(mUrlInput.getTag())) { - // only change text if different - mUrlInput.setText((String) mUrlInput.getTag(), false); - mUrlInput.selectAll(); - } - mTabSwitcher.setVisibility(View.GONE); mTabText.setVisibility(View.GONE); - break; case StateListener.STATE_EDITED: mStopButton.setVisibility(View.GONE); diff --git a/src/com/android/browser/stub/NullController.java b/src/com/android/browser/stub/NullController.java index 1df77db3..d513b7d8 100644 --- a/src/com/android/browser/stub/NullController.java +++ b/src/com/android/browser/stub/NullController.java @@ -38,6 +38,14 @@ public class NullController implements ActivityController { } @Override + public void onStop() { + } + + @Override + public void onStart() { + } + + @Override public boolean onMenuOpened(int featureId, Menu menu) { return false; } |