author Julian_Chu <walkingice0204@gmail.com>

Wed, 19 Apr 2017 11:49:11 +0800

changeset 564995 f2c583315bd0b7fe21534b75e929ee3fe22efff8

parent 564994 3296b6b3c2e78f3ee7814839f878b74c3c596c72

child 624880 2272acf48d417394233b4de878166a50acfff2df

push id 54746

push user bmo:walkingice0204@gmail.com

push date Wed, 19 Apr 2017 09:41:41 +0000

bugs 1353019

milestone 55.0a1

mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable-hdpi-v11/ic_menu_stop.png file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_stop.png file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_stop.png file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_stop.png file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_stop.png file | annotate | diff | comparison | revisions

mobile/android/base/resources/drawable/customtabs_menu_item_control.xml file | annotate | diff | comparison | revisions

mobile/android/base/resources/menu/customtabs_menu.xml file | annotate | diff | comparison | revisions
--- a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
@@ -59,16 +59,18 @@ public class CustomTabsActivity extends 
     private ProgressBar mProgressView;
     // A state to indicate whether this activity is finishing with customize animation
     private boolean usingCustomAnimation = false;
 
     // Bug 1351605 - getIntent() not always returns the intent which started this activity.
     // Therefore we make a copy in case of this Activity is re-created.
     private Intent startIntent;
 
+    private MenuItem menuItemControl;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         if (savedInstanceState != null) {
             startIntent = savedInstanceState.getParcelable(SAVED_START_INTENT);
         } else {
             Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.INTENT, "customtab");
@@ -257,18 +259,18 @@ public class CustomTabsActivity extends 
                 finish();
                 return true;
             case R.id.share:
                 onShareClicked();
                 return true;
             case R.id.custom_tabs_menu_forward:
                 onForwardClicked();
                 return true;
-            case R.id.custom_tabs_menu_reload:
-                onReloadClicked();
+            case R.id.custom_tabs_menu_control:
+                onLoadingControlClicked();
                 return true;
             case R.id.custom_tabs_menu_open_in:
                 onOpenInClicked();
                 return true;
         }
 
         final PendingIntent intent = menuItemsIntent.get(item.getItemId());
         if (intent != null) {
@@ -344,16 +346,18 @@ public class CustomTabsActivity extends 
         if (openItem != null) {
             final Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://"));
             final ResolveInfo info = getPackageManager()
                     .resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY);
             final String name = info.loadLabel(getPackageManager()).toString();
             openItem.setTitle(getString(R.string.custom_tabs_menu_item_open_in, name));
         }
 
+        menuItemControl = geckoMenu.findItem(R.id.custom_tabs_menu_control);
+
         geckoMenu.addFooterView(
                 getLayoutInflater().inflate(R.layout.customtabs_options_menu_footer, geckoMenu, false),
                 null,
                 false);
 
         return popupMenu;
     }
 
@@ -381,22 +385,34 @@ public class CustomTabsActivity extends 
      */
     private void updateProgress(final boolean isLoading, final int progress) {
         if (isLoading) {
             mProgressView.setVisibility(View.VISIBLE);
             mProgressView.setProgress(progress);
         } else {
             mProgressView.setVisibility(View.GONE);
         }
+
+        if (menuItemControl != null) {
+            Drawable icon = menuItemControl.getIcon();
+            icon.setLevel(progress);
+        }
     }
 
-    private void onReloadClicked() {
+    /**
+     * Call this method to reload page, or stop page loading if progress not complete yet.
+     */
+    private void onLoadingControlClicked() {
         final Tab tab = Tabs.getInstance().getSelectedTab();
         if (tab != null) {
-            tab.doReload(true);
+            if (tab.getLoadProgress() == Tab.LOAD_PROGRESS_STOP) {
+                tab.doReload(true);
+            } else {
+                tab.doStop();
+            }
         }
     }
 
     private void onForwardClicked() {
         final Tab tab = Tabs.getInstance().getSelectedTab();
         if ((tab != null) && tab.canDoForward()) {
             tab.doForward();
         }
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/drawable/customtabs_menu_item_control.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- before progress to 100, show stop-icon for control  -->
+    <item android:maxLevel="99" android:drawable="@drawable/ic_menu_stop"/>
+    <item android:maxLevel="100" android:drawable="@drawable/ic_menu_reload"/>
+</level-list>
--- a/mobile/android/base/resources/menu/customtabs_menu.xml
+++ b/mobile/android/base/resources/menu/customtabs_menu.xml
@@ -11,18 +11,18 @@
 
     <item
         android:id="@+id/custom_tabs_menu_forward"
         android:icon="@drawable/ic_menu_forward"
         android:showAsAction="always"
         android:title="@string/forward"/>
 
     <item
-        android:id="@+id/custom_tabs_menu_reload"
-        android:icon="@drawable/ic_menu_reload"
+        android:id="@+id/custom_tabs_menu_control"
+        android:icon="@drawable/customtabs_menu_item_control"
         android:showAsAction="always"
-        android:title="@string/share"/>
+        android:title=""/>
 
     <item
         android:id="@+id/custom_tabs_menu_open_in"
         android:title="@string/custom_tabs_menu_item_open_in"/>
 
 </menu>
author	Julian_Chu <walkingice0204@gmail.com>
	Wed, 19 Apr 2017 11:49:11 +0800
changeset 564995	f2c583315bd0b7fe21534b75e929ee3fe22efff8
parent 564994	3296b6b3c2e78f3ee7814839f878b74c3c596c72
child 624880	2272acf48d417394233b4de878166a50acfff2df
push id	54746
push user	bmo:walkingice0204@gmail.com
push date	Wed, 19 Apr 2017 09:41:41 +0000
bugs	1353019
milestone	55.0a1
mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable-hdpi-v11/ic_menu_stop.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_stop.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_stop.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_stop.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_stop.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/drawable/customtabs_menu_item_control.xml		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/resources/menu/customtabs_menu.xml		file \| annotate \| diff \| comparison \| revisions