PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add animation to button navigation settings page

Browse Source 
This animation was missing in the original changelist and has now been created by the UX team.

Bug: 191888710
Test: Physical device
Change-Id: Iefb3f0e80f4763f1358706e9dbc84a29e1f04b23
This commit is contained in:
Jernej Virag
2021-12-07 12:10:15 +00:00
parent b048c37062
commit 69b895c892
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/raw/lottie_button_nav_menu.json Normal file
View File

File diff suppressed because one or more lines are too long

2
res/values/strings.xml
View File

@@ -11793,7 +11793,7 @@
<string name="assistant_corner_gesture_summary">Swipe up from a bottom corner to invoke digital assistant app.</string> <string name="assistant_corner_gesture_summary">Swipe up from a bottom corner to invoke digital assistant app.</string>
<!-- Title text for holding a long press on Home button to invoke the digital assistant app. [CHAR LIMIT=60] --> <!-- Title text for holding a long press on Home button to invoke the digital assistant app. [CHAR LIMIT=60] -->
<string name="assistant_long_press_home_gesture_title">Hold Home to invoke assistant</string> <string name="assistant_long_press_home_gesture_title">Hold Home for Assistant</string>
<!-- Summary text for holding a long press on Home button to invoke the digital assistant app. [CHAR LIMIT=NONE] --> <!-- Summary text for holding a long press on Home button to invoke the digital assistant app. [CHAR LIMIT=NONE] -->
<string name="assistant_long_press_home_gesture_summary">Press and hold the Home button to invoke digital assistant app.</string> <string name="assistant_long_press_home_gesture_summary">Press and hold the Home button to invoke digital assistant app.</string>

25
res/xml/button_navigation_settings.xml
View File

@@ -21,19 +21,20 @@
android:title="@string/button_navigation_settings_activity_title" android:title="@string/button_navigation_settings_activity_title"
settings:keywords="@string/keywords_button_navigation_settings"> settings:keywords="@string/keywords_button_navigation_settings">
<PreferenceCategory <!-- Animation uses embedded PNGs and lottie requires asset folder to be set despite
android:key="assistant_button_navigation_category" embedding. -->
android:persistent="false" <com.android.settingslib.widget.IllustrationPreference
android:title="@string/assistant_gesture_category_title"> android:key="gesture_power_menu_video"
settings:searchable="false"
settings:lottie_imageAssetsFolder="button_nav_menu"
settings:lottie_rawRes="@raw/lottie_button_nav_menu"/>
<SwitchPreference <SwitchPreference
android:key="assistant_long_press_home_gesture" android:key="assistant_long_press_home_gesture"
android:title="@string/assistant_long_press_home_gesture_title" android:title="@string/assistant_long_press_home_gesture_title"
android:summary="@string/assistant_long_press_home_gesture_summary" android:summary="@string/assistant_long_press_home_gesture_summary"
settings:controller="com.android.settings.gestures.ButtonNavigationSettingsAssistController" settings:controller="com.android.settings.gestures.ButtonNavigationSettingsAssistController"
/> />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

10
tests/robotests/src/com/android/settings/gestures/ButtonNavigationSettingsFragmentTest.java
View File

@@ -43,19 +43,21 @@ public class ButtonNavigationSettingsFragmentTest {
} }
@Test @Test
public void getNonIndexableKeys_twoButtonNavigationAvailable_allKeysIndexable() { public void getNonIndexableKeys_twoButtonNavigationAvailable_allKeysExceptAnimIndexable() {
addPackageToPackageManager(ApplicationProvider.getApplicationContext(), addPackageToPackageManager(ApplicationProvider.getApplicationContext(),
NAV_BAR_MODE_2BUTTON_OVERLAY); NAV_BAR_MODE_2BUTTON_OVERLAY);
assertThat(ButtonNavigationSettingsFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys( assertThat(ButtonNavigationSettingsFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
ApplicationProvider.getApplicationContext())).isEmpty(); ApplicationProvider.getApplicationContext())).containsExactly(
"gesture_power_menu_video");
} }
@Test @Test
public void getNonIndexableKeys_threeButtonNavigationAvailable_allKeysIndexable() { public void getNonIndexableKeys_threeButtonNavigationAvailable_allKeysExceptAnimIndexable() {
addPackageToPackageManager(ApplicationProvider.getApplicationContext(), addPackageToPackageManager(ApplicationProvider.getApplicationContext(),
NAV_BAR_MODE_3BUTTON_OVERLAY); NAV_BAR_MODE_3BUTTON_OVERLAY);
assertThat(ButtonNavigationSettingsFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys( assertThat(ButtonNavigationSettingsFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
ApplicationProvider.getApplicationContext())).isEmpty(); ApplicationProvider.getApplicationContext())).containsExactly(
"gesture_power_menu_video");
} }
private static void addPackageToPackageManager(Context context, String pkg) { private static void addPackageToPackageManager(Context context, String pkg) {