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

Change the illustration in one-hand mode page. am: 913fbf7e0c am: 44a2f596e2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064552

Change-Id: Ie85a04acb00e94d76aa7b57d8137c76f7552a8a7
This commit is contained in:
Stanley Wang
2021-06-30 06:27:20 +00:00
committed by Automerger Merge Worker
parent cad3e59719 44a2f596e2
commit 7d692e89e0
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
res/raw/lottie_swipe_for_notifications.json Normal file
View File

37
src/com/android/settings/gestures/OneHandedSettings.java
View File

@@ -16,19 +16,18 @@
package com.android.settings.gestures; package com.android.settings.gestures;
import android.app.Activity;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment; import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.widget.IllustrationPreference;
/** /**
* Fragment for One-handed mode settings * Fragment for One-handed mode settings
@@ -37,13 +36,27 @@ import com.android.settings.search.BaseSearchIndexProvider;
* providing basic accessibility shortcut service setup. * providing basic accessibility shortcut service setup.
*/ */
public class OneHandedSettings extends AccessibilityShortcutPreferenceFragment { public class OneHandedSettings extends AccessibilityShortcutPreferenceFragment {
private static final String ONE_HANDED_SHORTCUT_KEY = "one_handed_shortcuts_preference"; private static final String ONE_HANDED_SHORTCUT_KEY = "one_handed_shortcuts_preference";
private static final String ONE_HANDED_ILLUSTRATION_KEY = "one_handed_header";
private String mFeatureName; private String mFeatureName;
private OneHandedSettingsUtils mUtils;
@Override @Override
protected void updatePreferenceStates() { protected void updatePreferenceStates() {
OneHandedSettingsUtils.setUserId(UserHandle.myUserId()); OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
super.updatePreferenceStates(); super.updatePreferenceStates();
final IllustrationPreference preference =
(IllustrationPreference) getPreferenceScreen().findPreference(
ONE_HANDED_ILLUSTRATION_KEY);
if (preference != null) {
final boolean isSwipeDownNotification =
OneHandedSettingsUtils.isSwipeDownNotificationEnabled(getContext());
preference.setLottieAnimationResId(
isSwipeDownNotification ? R.raw.lottie_swipe_for_notifications
: R.raw.lottie_one_hand_mode);
}
} }
@Override @Override
@@ -69,9 +82,21 @@ public class OneHandedSettings extends AccessibilityShortcutPreferenceFragment {
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public void onStart() {
Bundle savedInstanceState) { super.onStart();
return super.onCreateView(inflater, container, savedInstanceState); mUtils = new OneHandedSettingsUtils(this.getContext());
mUtils.registerToggleAwareObserver(uri -> {
Activity activity = getActivity();
if (activity != null) {
activity.runOnUiThread(() -> updatePreferenceStates());
}
});
}
@Override
public void onStop() {
super.onStop();
mUtils.unregisterToggleAwareObserver();
} }
@Override @Override