فهرست منبع

Merge pull request #777 from uazo/fix-771

add item in main_menu_regroup.xml resource
Carl 4 سال پیش
والد
کامیت
8b8c74af26
2فایلهای تغییر یافته به همراه30 افزوده شده و 8 حذف شده
  1. 15 4
      build/patches/Add-exit-menu-item.patch
  2. 15 4
      build/patches/Add-menu-item-to-view-source.patch

+ 15 - 4
build/patches/Add-exit-menu-item.patch

@@ -5,10 +5,11 @@ Subject: Add exit menu item
 Corrected Exit functionality
 ---
  chrome/android/java/res/menu/main_menu.xml                  | 4 ++++
+ chrome/android/java/res/menu/main_menu_regroup.xml          | 3 +++
  .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 6 ++++++
  .../chrome/browser/init/ChromeLifetimeController.java       | 6 +++++-
  .../browser/ui/android/strings/android_chrome_strings.grd   | 3 +++
- 4 files changed, 18 insertions(+), 1 deletion(-)
+ 5 files changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
@@ -31,6 +32,19 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
      </group>
  
      <!-- Items shown only in the tab switcher when start surface is enabled -->
+diff --git a/chrome/android/java/res/menu/main_menu_regroup.xml b/chrome/android/java/res/menu/main_menu_regroup.xml
+--- a/chrome/android/java/res/menu/main_menu_regroup.xml
++++ b/chrome/android/java/res/menu/main_menu_regroup.xml
+@@ -133,6 +133,9 @@
+             android:icon="@drawable/vr_headset" />
+         <item android:id="@+id/managed_by_menu_id"
+             android:title="@string/managed" />
++        <item android:id="@+id/exit_id"
++            android:title="@string/menu_exit" 
++            android:icon="@drawable/ic_exit_to_app_white_24dp"/>
+     </group>
+ 
+     <!-- Items shown only in the tab switcher -->
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -83,6 +97,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_MENU_CLOSE_ALL_TABS" desc="Menu item for closing all open tabs. [CHAR-LIMIT=27]">
          Close all tabs
        </message>
--- 
-2.17.1
-

+ 15 - 4
build/patches/Add-menu-item-to-view-source.patch

@@ -5,12 +5,13 @@ Subject: Add menu item to view source
 ---
  chrome/android/java/res/menu/custom_tabs_menu.xml  |  3 +++
  chrome/android/java/res/menu/main_menu.xml         |  2 ++
+ chrome/android/java/res/menu/main_menu_regroup.xml |  3 +++
  .../chrome/browser/ChromeTabbedActivity.java       |  2 ++
  .../chrome/browser/app/ChromeActivity.java         |  2 ++
  .../app/appmenu/AppMenuPropertiesDelegateImpl.java | 14 ++++++++++++++
  .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
  .../ui/android/strings/android_chrome_strings.grd  |  3 +++
- 7 files changed, 27 insertions(+)
+ 8 files changed, 30 insertions(+)
 
 diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
 --- a/chrome/android/java/res/menu/custom_tabs_menu.xml
@@ -37,6 +38,19 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
          <item android:id="@+id/open_webapk_id"
              android:title="@string/menu_open_webapk"
              android:icon="@drawable/ic_add_to_home_screen" />
+diff --git a/chrome/android/java/res/menu/main_menu_regroup.xml b/chrome/android/java/res/menu/main_menu_regroup.xml
+--- a/chrome/android/java/res/menu/main_menu_regroup.xml
++++ b/chrome/android/java/res/menu/main_menu_regroup.xml
+@@ -97,6 +97,9 @@
+         <item android:id="@+id/add_to_homescreen_id"
+             android:title="@string/menu_add_to_homescreen"
+             android:icon="@drawable/ic_add_to_home_screen" />
++        <item android:id="@+id/view_source_id"
++            android:title="@string/view_source"
++            android:icon="@drawable/ic_drive_document_24dp" />
+         <item android:id="@+id/open_webapk_id"
+             android:title="@string/menu_open_webapk"
+             android:icon="@drawable/ic_add_to_home_screen" />
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -116,6 +130,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_PREFS_GOOGLE_SERVICES" desc="Title for the group of preferences that control non-personalized Google services. This group contains preferences for data that is not tied to user's Google Account. [CHAR-LIMIT=40]">
          Google services
        </message>
--- 
-2.17.1
-