commit bcd37dad6818ea0b6f83790c44949bfadd7b48af
author Dany Rybnikov <danyr@codeaurora.org> Mon Apr 20 11:43:15 2015 +0300
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:45 2015 +0200
tree 42a3acfd405eaf109a91bd0a2a71e12e9236e7c1
parent 13ba9fd2acd57db44be57705c0fc5ad7967ba0aa

Enable new scenarios for user activity hints

Add user activity hints to new UI scenarios:
browser brought to foreground, tab navigation view and
URL bar gets focus.

Change-Id: I3df26455be424f8bdf3c8e6a1d8fa53ca5602695

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 34a19fa..2ea733b 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -50,6 +50,7 @@
 
 import java.util.Locale;
 
+import org.codeaurora.net.NetworkServices;
 import org.codeaurora.swe.CookieManager;
 import org.codeaurora.swe.WebView;
 
@@ -218,6 +219,10 @@
     protected void onStart() {
         super.onStart();
         EngineInitializer.onActivityStart(BrowserActivity.this);
+        if (!BrowserSettings.getInstance().isPowerSaveModeEnabled()) {
+            //Notify about anticipated network activity
+            NetworkServices.hintUpcomingUserActivity();
+        }
     }
 
     @Override

src/com/android/browser/BrowserBookmarksPage.java

diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 80ff6d8..05bd248 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -564,8 +564,10 @@
         LoaderManager lm = getLoaderManager();
         lm.restartLoader(LOADER_ACCOUNTS, null, this);
 
-        //Notify about anticipated network activity
-        NetworkServices.HintUpcomingUserActivity();
+        if (!BrowserSettings.getInstance().isPowerSaveModeEnabled()) {
+            //Notify about anticipated network activity
+            NetworkServices.hintUpcomingUserActivity();
+        }
 
         EditBookmarksRestriction.getInstance().registerView(mGrid);
 

src/com/android/browser/NavigationBarBase.java

diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index d247066..344e7d9 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -56,6 +56,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
+import org.codeaurora.net.NetworkServices;
 import org.codeaurora.swe.Engine;
 import org.codeaurora.swe.WebRefiner;
 import org.codeaurora.swe.WebView;
@@ -338,6 +339,10 @@
         if (hasFocus) {
             Engine.warmUpChildProcessAsync(mUiController.getActivity().getApplicationContext());
             mBaseUi.showTitleBar();
+            if (!BrowserSettings.getInstance().isPowerSaveModeEnabled()) {
+                //Notify about anticipated network activity
+                NetworkServices.hintUpcomingUserActivity();
+            }
         } else if (!mUrlInput.needsUpdate()) {
             mUrlInput.dismissDropDown();
             mUrlInput.hideIME();

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index c051ec0..f3a08f7 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -46,6 +46,7 @@
 
 import com.android.browser.UrlInputView.StateListener;
 
+import org.codeaurora.net.NetworkServices;
 import org.codeaurora.swe.WebView;
 
 /**
@@ -337,6 +338,10 @@
                         onShowNavScreenContinue(sbm);
                     }
                 });
+        if (!BrowserSettings.getInstance().isPowerSaveModeEnabled()) {
+            //Notify about anticipated network activity
+            NetworkServices.hintUpcomingUserActivity();
+        }
         mActiveTab.capture();
     }