Integrate One handed mode shortcut preference

1) Update AccessibilityShortcutPreferenceFragment extends
   DashboardFragment
2) OneHandedSettings extends AccessibilityShortcutPreferenceFragment
   for shortcut feature
3) Add General Category above shortcut preference

Test: Settings > System > Gesture > One handed mode
Test: Settings > A11y > System Controls > One handed mode
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .OneHandedShortcutPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .OneHandedShortcutPreferenceFragmentTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .OneHandedActionShowNotificationPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .OneHandedSettingsUtilsTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings
      .AccessibilityShortcutPreferenceFragmentTest"

Bug: 182425480
Change-Id: I653388beea422e9bf47fd3240367fb374d6f0025
This commit is contained in:
Bill Lin
2021-06-10 02:45:44 +08:00
parent 76d6d66353
commit 3ae771d04a
6 changed files with 177 additions and 23 deletions

View File

@@ -17,31 +17,28 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.os.Bundle;
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.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
/**
* The Fragment for one-handed mode settings.
* Fragment for One-handed mode settings
*
* <p>The child {@link AccessibilityShortcutPreferenceFragment} shows the actual UI for
* providing basic accessibility shortcut service setup.
*/
@SearchIndexable
public class OneHandedSettings extends DashboardFragment {
private static final String TAG = "OneHandedSettings";
@Override
public int getMetricsCategory() {
return SettingsEnums.SETTINGS_ONE_HANDED;
}
@Override
protected String getLogTag() {
return TAG;
}
public class OneHandedSettings extends AccessibilityShortcutPreferenceFragment {
private static final String ONE_HANDED_SHORTCUT_KEY = "one_handed_shortcuts_preference";
private String mFeatureName;
@Override
protected void updatePreferenceStates() {
@@ -49,11 +46,60 @@ public class OneHandedSettings extends DashboardFragment {
super.updatePreferenceStates();
}
@Override
public int getDialogMetricsCategory(int dialogId) {
final int dialogMetrics = super.getDialogMetricsCategory(dialogId);
return dialogMetrics == SettingsEnums.ACTION_UNKNOWN ? SettingsEnums.SETTINGS_ONE_HANDED
: dialogMetrics;
}
@Override
public int getMetricsCategory() {
return SettingsEnums.SETTINGS_ONE_HANDED;
}
@Override
protected String getShortcutPreferenceKey() {
return ONE_HANDED_SHORTCUT_KEY;
}
@Override
protected boolean showGeneralCategory() {
return true;
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return super.onCreateView(inflater, container, savedInstanceState);
}
@Override
protected ComponentName getComponentName() {
return AccessibilityShortcutController.ONE_HANDED_COMPONENT_NAME;
}
@Override
protected CharSequence getLabelName() {
return mFeatureName;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.one_handed_settings;
}
@Override
protected String getLogTag() {
return null;
}
@Override
public void onCreate(Bundle savedInstanceState) {
mFeatureName = getContext().getString(R.string.one_handed_title);
super.onCreate(savedInstanceState);
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.one_handed_settings) {
@Override