mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1833728 - Remove redundant 'android:shortcutLongLabel' strings. r=android-reviewers,gl 

https://developer.android.com/guide/app-actions/action-schema says `android:shortcutLongLabel` is optional and we were setting `shortcutLongLabel` and `shortcutShortLabel` to the same string, so we can remove `shortcutLongLabel` and use `shortcutShortLabel` for both the shortcut name in the app's shortcut menu and on the home screen.

Differential Revision: https://phabricator.services.mozilla.com/D206981
This commit is contained in:
Chris Peterson 2024-04-15 16:49:18 +00:00
Родитель 80a3e841d0
Коммит e265c0ddb9
6 изменённых файлов: 15 добавлений и 74 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

44
mobile/android/fenix/app/lint-baseline.xml
Просмотреть файл

@ -155,28 +155,6 @@
column="9"/> column="9"/>
</issue> </issue>
<issue
id="UnusedAttribute"
message="Attribute `shortcutLongLabel` is only used in API level 25 and higher (current min is 21)"
errorLine1=" android:shortcutLongLabel=&quot;@string/home_screen_shortcut_open_new_tab_2&quot;>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/debug/res/xml/shortcuts.xml"
line="12"
column="9"/>
</issue>
<issue
id="UnusedAttribute"
message="Attribute `shortcutLongLabel` is only used in API level 25 and higher (current min is 21)"
errorLine1=" android:shortcutLongLabel=&quot;@string/home_screen_shortcut_open_new_tab_2&quot;>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/xml/shortcuts.xml"
line="12"
column="9"/>
</issue>
<issue <issue
id="UnusedAttribute" id="UnusedAttribute"
message="Attribute `shortcutId` is only used in API level 25 and higher (current min is 21)" message="Attribute `shortcutId` is only used in API level 25 and higher (current min is 21)"
@ -221,28 +199,6 @@
column="9"/> column="9"/>
</issue> </issue>
<issue
id="UnusedAttribute"
message="Attribute `shortcutLongLabel` is only used in API level 25 and higher (current min is 21)"
errorLine1=" android:shortcutLongLabel=&quot;@string/home_screen_shortcut_open_new_private_tab_2&quot;>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/debug/res/xml/shortcuts.xml"
line="23"
column="9"/>
</issue>
<issue
id="UnusedAttribute"
message="Attribute `shortcutLongLabel` is only used in API level 25 and higher (current min is 21)"
errorLine1=" android:shortcutLongLabel=&quot;@string/home_screen_shortcut_open_new_private_tab_2&quot;>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/xml/shortcuts.xml"
line="23"
column="9"/>
</issue>
<issue <issue
id="UnusedAttribute" id="UnusedAttribute"
message="Attribute `android:foreground` has no effect on API levels lower than 23 (current min is 21)" message="Attribute `android:foreground` has no effect on API levels lower than 23 (current min is 21)"

9
mobile/android/fenix/app/src/beta/res/xml/shortcuts.xml
Просмотреть файл

@ -8,8 +8,7 @@
android:shortcutId="password_manager" android:shortcutId="password_manager"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_password_shortcut" android:icon="@drawable/ic_static_password_shortcut"
android:shortcutShortLabel="@string/home_screen_shortcut_passwords" android:shortcutShortLabel="@string/home_screen_shortcut_passwords">
android:shortcutLongLabel="@string/home_screen_shortcut_passwords">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER" android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER"
android:targetPackage="org.mozilla.firefox_beta" android:targetPackage="org.mozilla.firefox_beta"
@ -19,8 +18,7 @@
android:shortcutId="open_new_tab" android:shortcutId="open_new_tab"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_shortcut_tab" android:icon="@drawable/ic_static_shortcut_tab"
android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2" android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2">
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="org.mozilla.firefox_beta" android:targetPackage="org.mozilla.firefox_beta"
@ -30,8 +28,7 @@
android:shortcutId="open_new_private_tab" android:shortcutId="open_new_private_tab"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_shortcut_private_tab" android:icon="@drawable/ic_static_shortcut_private_tab"
android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2" android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2">
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="org.mozilla.firefox_beta" android:targetPackage="org.mozilla.firefox_beta"

9
mobile/android/fenix/app/src/debug/res/xml/shortcuts.xml
Просмотреть файл

@ -8,8 +8,7 @@
android:shortcutId="password_manager" android:shortcutId="password_manager"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_password_shortcut" android:icon="@drawable/ic_static_password_shortcut"
android:shortcutShortLabel="@string/home_screen_shortcut_passwords" android:shortcutShortLabel="@string/home_screen_shortcut_passwords">
android:shortcutLongLabel="@string/home_screen_shortcut_passwords">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER" android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER"
android:targetPackage="org.mozilla.fenix.debug" android:targetPackage="org.mozilla.fenix.debug"
@ -19,8 +18,7 @@
android:shortcutId="open_new_tab" android:shortcutId="open_new_tab"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_shortcut_tab" android:icon="@drawable/ic_static_shortcut_tab"
android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2" android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2">
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="org.mozilla.fenix.debug" android:targetPackage="org.mozilla.fenix.debug"
@ -30,8 +28,7 @@
android:shortcutId="open_new_private_tab" android:shortcutId="open_new_private_tab"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_shortcut_private_tab" android:icon="@drawable/ic_static_shortcut_private_tab"
android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2" android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2">
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="org.mozilla.fenix.debug" android:targetPackage="org.mozilla.fenix.debug"

9
mobile/android/fenix/app/src/main/res/xml/shortcuts.xml
Просмотреть файл

@ -8,8 +8,7 @@
android:shortcutId="password_manager" android:shortcutId="password_manager"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_password_shortcut" android:icon="@drawable/ic_static_password_shortcut"
android:shortcutShortLabel="@string/home_screen_shortcut_passwords" android:shortcutShortLabel="@string/home_screen_shortcut_passwords">
android:shortcutLongLabel="@string/home_screen_shortcut_passwords">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER" android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER"
android:targetPackage="org.mozilla.fenix" android:targetPackage="org.mozilla.fenix"
@ -19,8 +18,7 @@
android:shortcutId="open_new_tab" android:shortcutId="open_new_tab"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_shortcut_tab" android:icon="@drawable/ic_static_shortcut_tab"
android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2" android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2">
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="org.mozilla.fenix" android:targetPackage="org.mozilla.fenix"
@ -30,8 +28,7 @@
android:shortcutId="open_new_private_tab" android:shortcutId="open_new_private_tab"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_shortcut_private_tab" android:icon="@drawable/ic_static_shortcut_private_tab"
android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2" android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2">
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="org.mozilla.fenix" android:targetPackage="org.mozilla.fenix"

9
mobile/android/fenix/app/src/nightly/res/xml/shortcuts.xml
Просмотреть файл

@ -8,8 +8,7 @@
android:shortcutId="password_manager" android:shortcutId="password_manager"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_password_shortcut" android:icon="@drawable/ic_static_password_shortcut"
android:shortcutShortLabel="@string/home_screen_shortcut_passwords" android:shortcutShortLabel="@string/home_screen_shortcut_passwords">
android:shortcutLongLabel="@string/home_screen_shortcut_passwords">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER" android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER"
android:targetPackage="org.mozilla.fenix" android:targetPackage="org.mozilla.fenix"
@ -19,8 +18,7 @@
android:shortcutId="open_new_tab" android:shortcutId="open_new_tab"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_shortcut_tab" android:icon="@drawable/ic_static_shortcut_tab"
android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2" android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2">
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="org.mozilla.fenix" android:targetPackage="org.mozilla.fenix"
@ -30,8 +28,7 @@
android:shortcutId="open_new_private_tab" android:shortcutId="open_new_private_tab"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_shortcut_private_tab" android:icon="@drawable/ic_static_shortcut_private_tab"
android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2" android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2">
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="org.mozilla.fenix" android:targetPackage="org.mozilla.fenix"

9
mobile/android/fenix/app/src/release/res/xml/shortcuts.xml
Просмотреть файл

@ -8,8 +8,7 @@
android:shortcutId="password_manager" android:shortcutId="password_manager"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_password_shortcut" android:icon="@drawable/ic_static_password_shortcut"
android:shortcutShortLabel="@string/home_screen_shortcut_passwords" android:shortcutShortLabel="@string/home_screen_shortcut_passwords">
android:shortcutLongLabel="@string/home_screen_shortcut_passwords">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER" android:action="org.mozilla.fenix.OPEN_PASSWORD_MANAGER"
android:targetPackage="org.mozilla.firefox" android:targetPackage="org.mozilla.firefox"
@ -19,8 +18,7 @@
android:shortcutId="open_new_tab" android:shortcutId="open_new_tab"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_shortcut_tab" android:icon="@drawable/ic_static_shortcut_tab"
android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2" android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2">
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_TAB" android:action="org.mozilla.fenix.OPEN_TAB"
android:targetPackage="org.mozilla.firefox" android:targetPackage="org.mozilla.firefox"
@ -30,8 +28,7 @@
android:shortcutId="open_new_private_tab" android:shortcutId="open_new_private_tab"
android:enabled="true" android:enabled="true"
android:icon="@drawable/ic_static_shortcut_private_tab" android:icon="@drawable/ic_static_shortcut_private_tab"
android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2" android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2">
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
<intent <intent
android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB" android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage="org.mozilla.firefox" android:targetPackage="org.mozilla.firefox"