From 28367dae4d64e1a59846365a880ca3574e26b352 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Thu, 23 Feb 2023 04:53:05 +0000
Subject: [PATCH 1/3] [Settings] Customizable resource for hiding 3G preferred
 network type

Add a customiazble resource for specifying the carriers that avoiding
from showing 3G option within the preferred network type.

Bug: 261615630
Bug: 247995343
Bug: 268564499
Bug: 265147144
Bug: 267433657
Bug: 240176276
Bug: 266724047
Bug: 265147263
Bug: 242017692
Bug: 220998105
Bug: 209835551
Bug: 237837196
Bug: 239318933
Bug: 247996564
Test: local

Merged-In: I8092372372cb334b5ac1956b869d194b9fcd0523
Merged-In: I5c12ad23a240fbe70630855e5f98b5be83912674
Change-Id: I8092372372cb334b5ac1956b869d194b9fcd0523
---
 res/values/arrays.xml                         |  5 +++++
 ...nabledNetworkModePreferenceController.java | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b920c1b8069..9bc29560c9a 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1654,4 +1654,9 @@
          [CHAR LIMIT=NONE] -->
     <string-array name="allowlist_hide_summary_in_battery_usage" translatable="false">
     </string-array>
+
+    <!-- hide 3G option from preferred network type UI -->
+    <integer-array name="network_mode_3g_deprecated_carrier_id" translatable="false">
+    </integer-array>
+
 </resources>
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index e6bafbb71e5..d1b85282da2 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -22,6 +22,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
 import android.content.Context;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
@@ -239,6 +240,24 @@ public class EnabledNetworkModePreferenceController extends
                 // TODO: Using the carrier config.
                 mDisplay3gOptions = getResourcesForSubId().getBoolean(
                         R.bool.config_display_network_mode_3g_option);
+
+                int[] carriersWithout3gMenu = getResourcesForSubId().getIntArray(
+                        R.array.network_mode_3g_deprecated_carrier_id);
+                if ((carriersWithout3gMenu != null) && (carriersWithout3gMenu.length > 0)) {
+                    SubscriptionManager sm = mContext.getSystemService(SubscriptionManager.class);
+                    SubscriptionInfo subInfo = sm.getActiveSubscriptionInfo(mSubId);
+                    if (subInfo != null) {
+                        int carrierId = subInfo.getCarrierId();
+
+                        for (int idx = 0; idx < carriersWithout3gMenu.length; idx++) {
+                            if (carrierId == carriersWithout3gMenu[idx]) {
+                                mDisplay3gOptions = false;
+                                break;
+                            }
+                        }
+                    }
+                }
+
                 mLteEnabled = carrierConfig.getBoolean(CarrierConfigManager.KEY_LTE_ENABLED_BOOL);
             }
             Log.d(LOG_TAG, "PreferenceEntriesBuilder: subId" + mSubId

From 07ca5b7e4e3abd9e4b95f730cb0f266e53b6ccd7 Mon Sep 17 00:00:00 2001
From: Wenhui Yang <wenhuiy@google.com>
Date: Mon, 27 Feb 2023 23:37:27 +0000
Subject: [PATCH 2/3] [DO NOT MERGE] Fix tablet verify pin wording

Test: Manual - Reset tablet without removing accounts, observe the texts
displayed correctly for tablet. Expanded related for devices.
Fixes: 267539281
Fixes: 270516438

Change-Id: If2ad3692b9fb2c8a374d8e988aac76a7254b8cd6
---
 res/values/strings.xml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ecf378d5bd6..173a7598159 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4730,11 +4730,25 @@
     <string name="lockpassword_strong_auth_required_work_password">For added security, enter your work password</string>
 
     <!-- An explanation text that the pattern needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
-    <string name="lockpassword_confirm_your_pattern_details_frp">Your phone was reset to factory settings. To use this phone, enter your previous pattern.</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" product="default">Your phone was reset to factory settings. To use this phone, enter your previous pattern.</string>
+    <!-- An explanation text that the pattern needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_pattern_details_frp" product="tablet">Your tablet was reset to factory settings. To use this tablet, enter your previous pattern.</string>
+    <!-- An explanation text that the pattern needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_pattern_details_frp" product="device">Your device was reset to factory settings. To use this device, enter your previous pattern.</string>
+
     <!-- An explanation text that the pin needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
-    <string name="lockpassword_confirm_your_pin_details_frp">Your phone was reset to factory settings. To use this phone, enter your previous PIN.</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" product="default">Your phone was reset to factory settings. To use this phone, enter your previous PIN.</string>
+    <!-- An explanation text that the pin needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_pin_details_frp" product="tablet">Your tablet was reset to factory settings. To use this tablet, enter your previous PIN.</string>
+    <!-- An explanation text that the pin needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_pin_details_frp" product="device">Your device was reset to factory settings. To use this device, enter your previous PIN.</string>
+
     <!-- An explanation text that the password needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
-    <string name="lockpassword_confirm_your_password_details_frp">Your phone was reset to factory settings. To use this phone, enter your previous password.</string>
+    <string name="lockpassword_confirm_your_password_details_frp" product="default">Your phone was reset to factory settings. To use this phone, enter your previous password.</string>
+    <!-- An explanation text that the password needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_password_details_frp" product="tablet">Your tablet was reset to factory settings. To use this tablet, enter your previous password.</string>
+    <!-- An explanation text that the password needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
+    <string name="lockpassword_confirm_your_password_details_frp" product="device">Your device was reset to factory settings. To use this device, enter your previous password.</string>
 
     <!-- Header shown when pattern needs to be solved because the device was factory reset. [CHAR LIMIT=100] -->
     <string name="lockpassword_confirm_your_pattern_header_frp">Verify pattern</string>

From 64c23fc5cf6afa5425d4bea2dab4a9efc10ee64a Mon Sep 17 00:00:00 2001
From: Phil Weaver <pweaver@google.com>
Date: Thu, 2 Mar 2023 23:53:30 +0000
Subject: [PATCH 3/3] Revert "Add discrete contrast UI slider in the setting"

This reverts commit fd3911ba29a136cb6310442d825be389d3c8fd37.

Reason for revert: Setting will be re-landed in developer settings. Not currently aligned with other accessibility features.

Change-Id: If896d87b0bd6d5e74422c1919e60d8717d28a1d0
---
 .../preference_contrast_level_slider.xml      | 104 ---------------
 res/values/dimens.xml                         |   4 -
 res/values/strings.xml                        |   6 -
 res/xml/accessibility_color_and_motion.xml    |   5 -
 .../accessibility/ContrastLevelSeekBar.java   | 118 ------------------
 .../ContrastLevelSeekBarPreference.java       |  73 -----------
 .../ContrastLevelSeekBarPreferenceTest.java   |  69 ----------
 .../ContrastLevelSeekBarTest.java             | 106 ----------------
 8 files changed, 485 deletions(-)
 delete mode 100644 res/layout/preference_contrast_level_slider.xml
 delete mode 100644 src/com/android/settings/accessibility/ContrastLevelSeekBar.java
 delete mode 100644 src/com/android/settings/accessibility/ContrastLevelSeekBarPreference.java
 delete mode 100644 tests/robotests/src/com/android/settings/accessibility/ContrastLevelSeekBarPreferenceTest.java
 delete mode 100644 tests/robotests/src/com/android/settings/accessibility/ContrastLevelSeekBarTest.java

diff --git a/res/layout/preference_contrast_level_slider.xml b/res/layout/preference_contrast_level_slider.xml
deleted file mode 100644
index 1766dd7f2ee..00000000000
--- a/res/layout/preference_contrast_level_slider.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:clickable="false"
-    android:orientation="horizontal">
-
-    <include layout="@layout/settingslib_icon_frame"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="16dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <TextView
-                android:id="@android:id/title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceListItem"
-                android:textColor="?android:attr/textColorPrimary"
-                android:ellipsize="marquee"
-                android:hyphenationFrequency="normalFast"
-                android:lineBreakWordStyle="phrase"
-                android:fadingEdge="horizontal"/>
-            <LinearLayout
-                android:id="@android:id/widget_frame"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:orientation="vertical"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layoutDirection="ltr"
-            android:orientation="vertical">
-
-            <com.android.settings.accessibility.ContrastLevelSeekBar
-                android:id="@*android:id/seekbar"
-                android:minHeight="?android:attr/listPreferredItemHeightSmall"
-                android:paddingStart="0dp"
-                android:paddingEnd="0dp"
-                android:layout_gravity="center_vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:orientation="horizontal">
-                <TextView
-                    android:id="@+id/left_text"
-                    android:text="@string/accessibility_contrast_level_left_label"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="?android:attr/textColorSecondary"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:maxLines="1"
-                    android:textAlignment="viewStart" />
-                <TextView
-                    android:id="@+id/right_text"
-                    android:text="@string/accessibility_contrast_level_right_label"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="?android:attr/textColorSecondary"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:maxLines="1"
-                    android:textAlignment="viewEnd" />
-
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1bd09438e8d..57e47f2ec91 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -220,10 +220,6 @@
     <dimen name="accessibility_qs_tooltip_margin">20dp</dimen>
     <dimen name="accessibility_qs_tooltip_margin_top">27dp</dimen>
 
-    <!-- Contrast level slider -->
-    <dimen name="contrast_level_seekbar_center_marker_height">14dp</dimen>
-    <dimen name="contrast_level_seekbar_center_marker_width">1dp</dimen>
-
     <!-- Restricted icon in switch bar -->
     <dimen name="restricted_icon_margin_end">16dp</dimen>
     <!-- Restricted icon size in switch bar -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 28543148e14..ec6ae58c91f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4386,12 +4386,6 @@
     <string name="accessibility_disable_animations">Remove animations</string>
     <!-- Summary for the accessibility preference for disabling animations. [CHAR LIMIT=60] -->
     <string name="accessibility_disable_animations_summary">Reduce movement on the screen</string>
-    <!-- Title for the accessibility preference for the contrast level slider. [CHAR LIMIT=35] -->
-    <string name="accessibility_contrast_level_title">Contrast Level</string>
-    <!-- 'Low' text at the left of the contrast level slider. [CHAR LIMIT=20] -->
-    <string name="accessibility_contrast_level_left_label">Standard</string>
-    <!-- 'High' text at the right of the contrast level slider. [CHAR LIMIT=20] -->
-    <string name="accessibility_contrast_level_right_label">High</string>
     <!-- Title for the accessibility preference for primary mono. [CHAR LIMIT=35] -->
     <string name="accessibility_toggle_primary_mono_title">Mono audio</string>
     <!-- Summary for the accessibility preference for primary mono. [CHAR LIMIT=60] -->
diff --git a/res/xml/accessibility_color_and_motion.xml b/res/xml/accessibility_color_and_motion.xml
index 72c67f93778..a3135261a9a 100644
--- a/res/xml/accessibility_color_and_motion.xml
+++ b/res/xml/accessibility_color_and_motion.xml
@@ -64,11 +64,6 @@
         android:title="@string/accessibility_toggle_large_pointer_icon_title"
         settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>
 
-    <com.android.settings.accessibility.ContrastLevelSeekBarPreference
-        android:key="seekbar_color_contrast"
-        android:persistent="false"
-        android:title="@string/accessibility_contrast_level_title"/>
-
     <PreferenceCategory
         android:key="experimental_category"
         android:persistent="false"
diff --git a/src/com/android/settings/accessibility/ContrastLevelSeekBar.java b/src/com/android/settings/accessibility/ContrastLevelSeekBar.java
deleted file mode 100644
index 87232852a66..00000000000
--- a/src/com/android/settings/accessibility/ContrastLevelSeekBar.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2022 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.
- */
-
-package com.android.settings.accessibility;
-
-import static android.view.HapticFeedbackConstants.CLOCK_TICK;
-
-import static com.android.settings.Utils.isNightMode;
-import static com.android.settings.accessibility.ContrastLevelSeekBarPreference.CONTRAST_SLIDER_TICKS;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.util.AttributeSet;
-import android.widget.SeekBar;
-
-import com.android.settings.R;
-
-/**
- * A custom seekbar for the contrast level setting.
- *
- * Adds a center line indicator between left and right, which snaps to if close.
- * Updates the Settings.Secure.CONTRAST_LEVEL setting on progress changed.
- *
- * TODO(b/266071578): remove this class and replace this with the final UI
- */
-public class ContrastLevelSeekBar extends SeekBar {
-
-    private final Context mContext;
-    private int mLastProgress = -1;
-
-    private final Paint mMarkerPaint;
-    private final Rect mMarkerRect;
-
-    private final OnSeekBarChangeListener mProxySeekBarListener = new OnSeekBarChangeListener() {
-        @Override
-        public void onStopTrackingTouch(SeekBar seekBar) { }
-
-        @Override
-        public void onStartTrackingTouch(SeekBar seekBar) { }
-
-        @Override
-        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-            if (!fromUser || progress == mLastProgress) return;
-            seekBar.performHapticFeedback(CLOCK_TICK);
-            mLastProgress = progress;
-
-            // rescale progress from [0, 1, 2] to [0, 0.5, 1]
-            final float contrastLevel = (float) progress / CONTRAST_SLIDER_TICKS;
-
-            Settings.Secure.putFloatForUser(mContext.getContentResolver(),
-                    Settings.Secure.CONTRAST_LEVEL, contrastLevel, UserHandle.USER_CURRENT);
-        }
-    };
-
-    public ContrastLevelSeekBar(Context context, AttributeSet attrs) {
-        this(context, attrs, com.android.internal.R.attr.seekBarStyle);
-    }
-
-    public ContrastLevelSeekBar(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0 /* defStyleRes */);
-    }
-
-    public ContrastLevelSeekBar(
-            Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        mContext = context;
-        Resources res = getResources();
-        mMarkerRect = new Rect(0 /* left */, 0 /* top */,
-                res.getDimensionPixelSize(R.dimen.contrast_level_seekbar_center_marker_width),
-                res.getDimensionPixelSize(R.dimen.contrast_level_seekbar_center_marker_height));
-        mMarkerPaint = new Paint();
-
-        // the might be a better colour for the markers, but this slider is temporary anyway
-        mMarkerPaint.setColor(isNightMode(context) ? Color.WHITE : Color.BLACK);
-        mMarkerPaint.setStyle(Paint.Style.FILL);
-        // Remove the progress colour
-        setProgressTintList(ColorStateList.valueOf(Color.TRANSPARENT));
-        super.setOnSeekBarChangeListener(mProxySeekBarListener);
-    }
-
-    @Override
-    public void setOnSeekBarChangeListener(OnSeekBarChangeListener listener) { }
-
-    // Note: the superclass AbsSeekBar.onDraw is synchronized.
-    @Override
-    protected synchronized void onDraw(Canvas canvas) {
-
-        // Draw a marker at the center of the seekbar
-        int seekBarCenter = (getHeight() - getPaddingBottom()) / 2;
-        float sliderWidth = getWidth() - mMarkerRect.right - getPaddingEnd();
-        canvas.save();
-        canvas.translate(sliderWidth / 2f,
-                seekBarCenter - (mMarkerRect.bottom / 2f));
-        canvas.drawRect(mMarkerRect, mMarkerPaint);
-        canvas.restore();
-        super.onDraw(canvas);
-    }
-}
diff --git a/src/com/android/settings/accessibility/ContrastLevelSeekBarPreference.java b/src/com/android/settings/accessibility/ContrastLevelSeekBarPreference.java
deleted file mode 100644
index 15795d83051..00000000000
--- a/src/com/android/settings/accessibility/ContrastLevelSeekBarPreference.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2022 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.
- */
-
-package com.android.settings.accessibility;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.util.AttributeSet;
-
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settings.widget.SeekBarPreference;
-
-/** A slider preference that directly controls the contrast level **/
-public class ContrastLevelSeekBarPreference extends SeekBarPreference {
-
-    /**
-     * The number of ticks of the slider (the more ticks, the more continuous the slider feels).
-     */
-    public static final int CONTRAST_SLIDER_TICKS = 2;
-
-    private final Context mContext;
-    private ContrastLevelSeekBar mSeekBar;
-
-    public ContrastLevelSeekBarPreference(Context context, AttributeSet attrs) {
-        super(context, attrs, TypedArrayUtils.getAttr(context,
-                R.attr.preferenceStyle,
-                android.R.attr.preferenceStyle));
-        mContext = context;
-        setLayoutResource(R.layout.preference_contrast_level_slider);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-        mSeekBar = (ContrastLevelSeekBar) view.findViewById(
-                com.android.internal.R.id.seekbar);
-        init();
-    }
-
-    private void init() {
-        if (mSeekBar == null) {
-            return;
-        }
-        final float contrastLevel = Settings.Secure.getFloatForUser(
-                mContext.getContentResolver(), Settings.Secure.CONTRAST_LEVEL,
-                0.f /* default */, UserHandle.USER_CURRENT);
-
-        mSeekBar.setMax(CONTRAST_SLIDER_TICKS);
-
-        // Rescale contrast from [0, 0.5, 1] to [0, 1, 2]
-        int progress = Math.max(0, Math.round(contrastLevel * CONTRAST_SLIDER_TICKS));
-
-        mSeekBar.setProgress(progress);
-        mSeekBar.setEnabled(isEnabled());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ContrastLevelSeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/ContrastLevelSeekBarPreferenceTest.java
deleted file mode 100644
index ff073f594d8..00000000000
--- a/tests/robotests/src/com/android/settings/accessibility/ContrastLevelSeekBarPreferenceTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2022 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.
- */
-
-package com.android.settings.accessibility;
-
-import static com.android.settings.accessibility.ContrastLevelSeekBarPreference.CONTRAST_SLIDER_TICKS;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowInteractionJankMonitor.class})
-public class ContrastLevelSeekBarPreferenceTest {
-
-    private Context mContext;
-    private AttributeSet mAttrs;
-    private PreferenceViewHolder mHolder;
-    private ContrastLevelSeekBar mSeekBar;
-    private ContrastLevelSeekBarPreference mSeekBarPreference;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mSeekBarPreference = new ContrastLevelSeekBarPreference(mContext, mAttrs);
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        final View view =
-                inflater.inflate(mSeekBarPreference.getLayoutResource(),
-                        new LinearLayout(mContext), false);
-        mHolder = PreferenceViewHolder.createInstanceForTests(view);
-        mSeekBar = view.findViewById(com.android.internal.R.id.seekbar);
-    }
-
-    @Test
-    public void seekBarPreferenceOnBindViewHolder_shouldInitSeekBarValue() {
-        mSeekBarPreference.onBindViewHolder(mHolder);
-
-        assertThat(mSeekBar.getMax()).isEqualTo(CONTRAST_SLIDER_TICKS);
-        assertThat(mSeekBar.getProgress()).isEqualTo(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ContrastLevelSeekBarTest.java b/tests/robotests/src/com/android/settings/accessibility/ContrastLevelSeekBarTest.java
deleted file mode 100644
index fd244361f33..00000000000
--- a/tests/robotests/src/com/android/settings/accessibility/ContrastLevelSeekBarTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2022 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.
- */
-
-package com.android.settings.accessibility;
-
-import static android.view.HapticFeedbackConstants.CLOCK_TICK;
-import static android.view.HapticFeedbackConstants.CONTEXT_CLICK;
-
-import static com.android.settings.accessibility.ContrastLevelSeekBarPreference.CONTRAST_SLIDER_TICKS;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.robolectric.Shadows.shadowOf;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.widget.SeekBar;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class ContrastLevelSeekBarTest {
-
-    private Context mContext;
-    private ContrastLevelSeekBar mSeekBar;
-    private SeekBar.OnSeekBarChangeListener mProxySeekBarListener;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mSeekBar = new ContrastLevelSeekBar(mContext, null);
-        mProxySeekBarListener = shadowOf(mSeekBar).getOnSeekBarChangeListener();
-    }
-
-    @Test
-    public void onProgressChanged_minimumValue_shouldModifyContrast() {
-        // Assign the test value of SeekBar progress
-        mProxySeekBarListener.onProgressChanged(mSeekBar, 0, true);
-
-        assertThat(Settings.Secure.getFloatForUser(
-                mContext.getContentResolver(), Settings.Secure.CONTRAST_LEVEL,
-                -10f, UserHandle.USER_CURRENT)).isEqualTo(0);
-    }
-
-    @Test
-    public void onProgressChanged_centerValue_shouldModifyContrast() {
-        // Assign the test value of SeekBar progress
-        mProxySeekBarListener.onProgressChanged(mSeekBar, CONTRAST_SLIDER_TICKS / 2, true);
-
-        assertThat(Settings.Secure.getFloatForUser(
-                mContext.getContentResolver(), Settings.Secure.CONTRAST_LEVEL,
-                -10f, UserHandle.USER_CURRENT)).isWithin(1e-8f).of(0.5f);
-    }
-
-    @Test
-    public void onProgressChanged_maximumValue_shouldModifyContrast() {
-        // Assign the test value of SeekBar progress
-        mProxySeekBarListener.onProgressChanged(mSeekBar, CONTRAST_SLIDER_TICKS, true);
-
-        assertThat(Settings.Secure.getFloatForUser(
-                mContext.getContentResolver(), Settings.Secure.CONTRAST_LEVEL,
-                -10f, UserHandle.USER_CURRENT)).isEqualTo(1);
-    }
-
-    @Test
-    public void onProgressChanged_minimumValue_clockTickFeedbackPerformed() {
-        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
-        mProxySeekBarListener.onProgressChanged(mSeekBar, 0, true);
-
-        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isEqualTo(CLOCK_TICK);
-    }
-
-    @Test
-    public void onProgressChanged_centerValue_clockTickFeedbackPerformed() {
-        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
-        mProxySeekBarListener.onProgressChanged(mSeekBar, CONTRAST_SLIDER_TICKS / 2, true);
-
-        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isEqualTo(CLOCK_TICK);
-    }
-
-    @Test
-    public void onProgressChanged_maximumValue_clockTickFeedbackPerformed() {
-        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
-        mProxySeekBarListener.onProgressChanged(mSeekBar, CONTRAST_SLIDER_TICKS, true);
-
-        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isEqualTo(CLOCK_TICK);
-    }
-}