Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit c97fdb03 authored by Dhina17's avatar Dhina17 Committed by Michael Bestas
Browse files

SystemUI: tuner: Migrate to M3 switch 

Tuners are being used within the settings so the switch style
should match with the settings.

Change-Id: I27fe9aae965b0d748981f18f914ab52530337ca5
parent 1cd374ee

packages/SystemUI/res/layout/preference_widget_switch_compat.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.google.android.material.materialswitch.MaterialSwitch

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/switchWidget"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:background="@null"

    android:clickable="false"

    android:focusable="false"

    android:theme="@style/Theme.Material3.DynamicColors.DayNight" />

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

+5 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import androidx.preference.Preference; 
import androidx.preference.Preference.OnPreferenceChangeListener;

import androidx.preference.PreferenceFragment;

import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;

import androidx.preference.SwitchPreferenceCompat;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -50,8 +50,8 @@ public class DemoModeFragment extends PreferenceFragment implements OnPreference 
        "managed_profile",

    };



    private SwitchPreference mEnabledSwitch;

    private SwitchPreference mOnSwitch;

    private SwitchPreferenceCompat mEnabledSwitch;

    private SwitchPreferenceCompat mOnSwitch;



    private DemoModeController mDemoModeController;

    private GlobalSettings mGlobalSettings;
@@ -69,10 +69,10 @@ public class DemoModeFragment extends PreferenceFragment implements OnPreference 
    @Override

    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {

        Context context = getContext();

        mEnabledSwitch = new SwitchPreference(context);

        mEnabledSwitch = new SwitchPreferenceCompat(context);

        mEnabledSwitch.setTitle(R.string.enable_demo_mode);

        mEnabledSwitch.setOnPreferenceChangeListener(this);

        mOnSwitch = new SwitchPreference(context);

        mOnSwitch = new SwitchPreferenceCompat(context);

        mOnSwitch.setTitle(R.string.show_demo_mode);

        mOnSwitch.setEnabled(false);

        mOnSwitch.setOnPreferenceChangeListener(this);

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

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import android.widget.TextView; 


import androidx.preference.Preference;

import androidx.preference.PreferenceFragment;

import androidx.preference.SwitchPreference;

import androidx.preference.SwitchPreferenceCompat;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;

import androidx.recyclerview.widget.RecyclerView.ViewHolder;
@@ -91,7 +91,7 @@ public class LockscreenFragment extends PreferenceFragment { 


    private void setupGroup(String buttonSetting, String unlockKey) {

        Preference shortcut = findPreference(buttonSetting);

        SwitchPreference unlock = (SwitchPreference) findPreference(unlockKey);

        SwitchPreferenceCompat unlock = (SwitchPreferenceCompat) findPreference(unlockKey);

        addTunable((k, v) -> {

            boolean visible = !TextUtils.isEmpty(v);

            unlock.setVisible(visible);

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

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.view.View; 
import androidx.preference.PreferenceFragment;

import androidx.preference.PreferenceScreen;

import androidx.preference.PreferenceViewHolder;

import androidx.preference.SwitchPreference;

import androidx.preference.SwitchPreferenceCompat;



import com.android.internal.util.ArrayUtils;

import com.android.systemui.Dependency;
@@ -110,7 +110,7 @@ public class PluginFragment extends PreferenceFragment { 
                // Don't manage privileged plugins, they are part of the OS.

                return;

            }

            SwitchPreference pref = new PluginPreference(prefContext, app, mPluginEnabler);

            SwitchPreferenceCompat pref = new PluginPreference(prefContext, app, mPluginEnabler);

            pref.setSummary("Plugins: " + toString(plugins.get(app.packageName)));

            screen.addPreference(pref);

        });
@@ -148,7 +148,7 @@ public class PluginFragment extends PreferenceFragment { 
        }

    };



    private static class PluginPreference extends SwitchPreference {

    private static class PluginPreference extends SwitchPreferenceCompat {

        private final boolean mHasSettings;

        private final PackageInfo mInfo;

        private final PluginEnabler mPluginEnabler;

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.provider.Settings; 
import android.text.TextUtils;

import android.util.AttributeSet;



import androidx.preference.SwitchPreference;

import androidx.preference.SwitchPreferenceCompat;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -32,7 +32,7 @@ import com.android.systemui.tuner.TunerService.Tunable; 


import java.util.Set;



public class StatusBarSwitch extends SwitchPreference implements Tunable {

public class StatusBarSwitch extends SwitchPreferenceCompat implements Tunable {



    private Set<String> mHideList;