base: tuner: fix navbar layout switch and remove old cruft

Change-Id: Ic9c63c1abf0493ee69a1ef8a3e95710be52a9f8e

Author: maxwen

packages/SystemUI/res/xml/nav_bar_tuner.xml

@@ -18,18 +18,12 @@
     xmlns:sysui="http://schemas.android.com/apk/res-auto"
     android:title="@string/nav_bar">
 
-    <com.android.systemui.tuner.RadioListPreference
+    <ListPreference
         android:key="layout"
         android:title="@string/nav_bar_layout"
         android:summary="%s"
         android:persistent="false"
         android:entries="@array/nav_bar_layouts"
         android:entryValues="@array/nav_bar_layouts_values" />
 
-    <Preference
-        android:key="navbar_editor"
-        android:title="@string/navbar_editor_title"
-        android:summary="@string/navbar_editor_summary"
-        android:fragment="com.android.systemui.tuner.NavBarEditor" />
-
 </PreferenceScreen>

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java

@@ -40,11 +40,12 @@
 import com.android.systemui.statusbar.phone.ReverseLinearLayout.ReverseRelativeLayout;
 import com.android.systemui.statusbar.policy.KeyButtonView;
 import com.android.systemui.tuner.TunerService;
+import com.android.systemui.tuner.TunerService.Tunable;
 
 import java.util.Objects;
 
 public class NavigationBarInflaterView extends FrameLayout
-        implements NavigationModeController.ModeChangedListener, TunerService.Tunable {
+        implements NavigationModeController.ModeChangedListener, Tunable {
 
     private static final String TAG = "NavBarInflater";
 
@@ -157,6 +158,7 @@ public void onNavigationModeChanged(int mode) {
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
         Dependency.get(TunerService.class).addTunable(this, NAV_BAR_INVERSE);
+        Dependency.get(TunerService.class).addTunable(this, NAV_BAR_VIEWS);
     }
 
     @Override
@@ -172,6 +174,9 @@ public void onTuningChanged(String key, String newValue) {
             mInverseLayout = TunerService.parseIntegerSwitch(newValue, false);
             updateLayoutInversion();
         }
+        if (NAV_BAR_VIEWS.equals(key)) {
+            setNavigationBarLayout(newValue);
+        }
     }
 
     @Override

packages/SystemUI/src/com/android/systemui/tuner/CustomListPreference.java

@@ -44,31 +44,17 @@
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceFragment;
 
 import com.android.systemui.Dependency;
 import com.android.systemui.R;
 import com.android.systemui.tuner.TunerService.Tunable;
 
 import java.util.ArrayList;
 
-public class NavBarTuner extends TunerPreferenceFragment {
+public class NavBarTuner extends PreferenceFragment {
 
     private static final String LAYOUT = "layout";
-    private static final String LEFT = "left";
-    private static final String RIGHT = "right";
-
-    private static final String TYPE = "type";
-    private static final String KEYCODE = "keycode";
-    private static final String ICON = "icon";
-
-    private static final int[][] ICONS = new int[][]{
-            {R.drawable.ic_qs_circle, R.string.tuner_circle},
-            {R.drawable.ic_add, R.string.tuner_plus},
-            {R.drawable.ic_remove, R.string.tuner_minus},
-            {R.drawable.ic_left, R.string.tuner_left},
-            {R.drawable.ic_right, R.string.tuner_right},
-            {R.drawable.ic_menu, R.string.tuner_menu},
-    };
 
     private final ArrayList<Tunable> mTunables = new ArrayList<>();
     private Handler mHandler;
@@ -89,8 +75,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.nav_bar_tuner);
         bindLayout((ListPreference) findPreference(LAYOUT));
-        bindButton(NAV_BAR_LEFT, NAVSPACE, LEFT);
-        bindButton(NAV_BAR_RIGHT, MENU_IME_ROTATE, RIGHT);
     }
 
     @Override
@@ -114,126 +98,11 @@ private void bindLayout(ListPreference preference) {
         }), NAV_BAR_VIEWS);
         preference.setOnPreferenceChangeListener((preference1, newValue) -> {
             String val = (String) newValue;
+            int valueIndex = preference.findIndexOfValue(val);
+            preference.setSummary(preference.getEntries()[valueIndex]);
             if ("default".equals(val)) val = null;
             Dependency.get(TunerService.class).setValue(NAV_BAR_VIEWS, val);
             return true;
         });
     }
-
-    private void bindButton(String setting, String def, String k) {
-        ListPreference type = (ListPreference) findPreference(TYPE + "_" + k);
-        Preference keycode = findPreference(KEYCODE + "_" + k);
-        ListPreference icon = (ListPreference) findPreference(ICON + "_" + k);
-        setupIcons(icon);
-        addTunable((key, newValue) -> mHandler.post(() -> {
-            String val = newValue;
-            if (val == null) {
-                val = def;
-            }
-            String button = extractButton(val);
-            if (button.startsWith(KEY)) {
-                type.setValue(KEY);
-                String uri = extractImage(button);
-                int code = extractKeycode(button);
-                icon.setValue(uri);
-                updateSummary(icon);
-                keycode.setSummary(code + "");
-                keycode.setVisible(true);
-                icon.setVisible(true);
-            } else {
-                type.setValue(button);
-                keycode.setVisible(false);
-                icon.setVisible(false);
-            }
-        }), setting);
-        OnPreferenceChangeListener listener = (preference, newValue) -> {
-            mHandler.post(() -> {
-                setValue(setting, type, keycode, icon);
-                updateSummary(icon);
-            });
-            return true;
-        };
-        type.setOnPreferenceChangeListener(listener);
-        icon.setOnPreferenceChangeListener(listener);
-        keycode.setOnPreferenceClickListener(preference -> {
-            EditText editText = new EditText(getContext());
-            new AlertDialog.Builder(getContext())
-                    .setTitle(preference.getTitle())
-                    .setView(editText)
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                        int code = KeyEvent.KEYCODE_ENTER;
-                        try {
-                            code = Integer.parseInt(editText.getText().toString());
-                        } catch (Exception e) {
-                        }
-                        keycode.setSummary(code + "");
-                        setValue(setting, type, keycode, icon);
-                    }).show();
-            return true;
-        });
-    }
-
-    private void updateSummary(ListPreference icon) {
-        try {
-            int size = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 14,
-                    getContext().getResources().getDisplayMetrics());
-            String pkg = icon.getValue().split("/")[0];
-            int id = Integer.parseInt(icon.getValue().split("/")[1]);
-            SpannableStringBuilder builder = new SpannableStringBuilder();
-            Drawable d = Icon.createWithResource(pkg, id)
-                    .loadDrawable(getContext());
-            d.setTint(Color.BLACK);
-            d.setBounds(0, 0, size, size);
-            ImageSpan span = new ImageSpan(d, ImageSpan.ALIGN_BASELINE);
-            builder.append("  ", span, 0);
-            builder.append(" ");
-            for (int i = 0; i < ICONS.length; i++) {
-                if (ICONS[i][0] == id) {
-                    builder.append(getString(ICONS[i][1]));
-                }
-            }
-            icon.setSummary(builder);
-        } catch (Exception e) {
-            Log.d("NavButton", "Problem with summary", e);
-            icon.setSummary(null);
-        }
-    }
-
-    private void setValue(String setting, ListPreference type, Preference keycode,
-            ListPreference icon) {
-        String button = type.getValue();
-        if (KEY.equals(button)) {
-            String uri = icon.getValue();
-            int code = KeyEvent.KEYCODE_ENTER;
-            try {
-                code = Integer.parseInt(keycode.getSummary().toString());
-            } catch (Exception e) {
-            }
-            button = button + KEY_CODE_START + code + KEY_IMAGE_DELIM + uri + KEY_CODE_END;
-        }
-        Dependency.get(TunerService.class).setValue(setting, button);
-    }
-
-    private void setupIcons(ListPreference icon) {
-        CharSequence[] labels = new CharSequence[ICONS.length];
-        CharSequence[] values = new CharSequence[ICONS.length];
-        int size = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 14,
-                getContext().getResources().getDisplayMetrics());
-        for (int i = 0; i < ICONS.length; i++) {
-            SpannableStringBuilder builder = new SpannableStringBuilder();
-            Drawable d = Icon.createWithResource(getContext().getPackageName(), ICONS[i][0])
-                    .loadDrawable(getContext());
-            d.setTint(Color.BLACK);
-            d.setBounds(0, 0, size, size);
-            ImageSpan span = new ImageSpan(d, ImageSpan.ALIGN_BASELINE);
-            builder.append("  ", span, 0);
-            builder.append(" ");
-            builder.append(getString(ICONS[i][1]));
-            labels[i] = builder;
-            values[i] = getContext().getPackageName() + "/" + ICONS[i][0];
-        }
-        icon.setEntries(labels);
-        icon.setEntryValues(values);
-    }
 }