readded the original files, builds break without it
This commit is contained in:
@@ -0,0 +1,227 @@
|
||||
From 4c3fbe18f838dce0c06342016ca4c933cf077a05 Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Sun, 13 Mar 2022 11:22:48 +0000
|
||||
Subject: [PATCH] Revert "[DO NOT MERGE] Allow a settings override for
|
||||
double-line clock"
|
||||
|
||||
Sorry but I SAID NEVER!
|
||||
|
||||
This reverts commit cb4836b4868adc1f06212ce82851a5f16169ab5c.
|
||||
|
||||
Change-Id: I8b4b1354f23981f6edbe7f3c81ec4f511da3cc1a
|
||||
---
|
||||
res/values/strings.xml | 4 -
|
||||
res/xml/security_lockscreen_settings.xml | 6 --
|
||||
.../LockscreenClockPreferenceController.java | 70 ---------------
|
||||
...ckscreenClockPreferenceControllerTest.java | 90 -------------------
|
||||
4 files changed, 170 deletions(-)
|
||||
delete mode 100644 src/com/android/settings/display/LockscreenClockPreferenceController.java
|
||||
delete mode 100644 tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java
|
||||
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index 62062b5fe8..35a8a39689 100644
|
||||
--- a/res/values/strings.xml
|
||||
+++ b/res/values/strings.xml
|
||||
@@ -13812,10 +13812,6 @@
|
||||
<string name="lockscreen_trivial_controls_summary">Control external devices without unlocking your phone or tablet if allowed by the device controls app</string>
|
||||
<!-- Trivial Device disabled controls summary [CHAR LIMIT=NONE] -->
|
||||
<string name="lockscreen_trivial_disabled_controls_summary">To use, first turn on \u0022Show device controls\u0022</string>
|
||||
- <!-- Lockscreen double-line clock summary [CHAR LIMIT=NONE] -->
|
||||
- <string name="lockscreen_double_line_clock_summary">Show double-line clock when available</string>
|
||||
- <!-- Lockscreen double-line clock toggle [CHAR LIMIT=60] -->
|
||||
- <string name="lockscreen_double_line_clock_setting_toggle">Double-line clock</string>
|
||||
<!-- Lock screen shortcuts preference [CHAR LIMIT=60] -->
|
||||
<string name="lockscreen_quick_affordances_title">Shortcuts</string>
|
||||
<!-- Summary for the lock screen button preference [CHAR LIMIT=60] -->
|
||||
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
|
||||
index 77a32122ee..b71839fe23 100644
|
||||
--- a/res/xml/security_lockscreen_settings.xml
|
||||
+++ b/res/xml/security_lockscreen_settings.xml
|
||||
@@ -78,12 +78,6 @@
|
||||
android:key="customizable_lock_screen_quick_affordances"
|
||||
android:title="@string/lockscreen_quick_affordances_title"
|
||||
settings:controller="com.android.settings.display.CustomizableLockScreenQuickAffordancesPreferenceController" />
|
||||
-
|
||||
- <SwitchPreference
|
||||
- android:key="lockscreen_double_line_clock_switch"
|
||||
- android:title="@string/lockscreen_double_line_clock_setting_toggle"
|
||||
- android:summary="@string/lockscreen_double_line_clock_summary"
|
||||
- settings:controller="com.android.settings.display.LockscreenClockPreferenceController" />
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
diff --git a/src/com/android/settings/display/LockscreenClockPreferenceController.java b/src/com/android/settings/display/LockscreenClockPreferenceController.java
|
||||
deleted file mode 100644
|
||||
index 70ae55eaf9..0000000000
|
||||
--- a/src/com/android/settings/display/LockscreenClockPreferenceController.java
|
||||
+++ /dev/null
|
||||
@@ -1,70 +0,0 @@
|
||||
-/*
|
||||
- * Copyright (C) 2021 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.display;
|
||||
-
|
||||
-import android.content.Context;
|
||||
-import android.provider.Settings;
|
||||
-
|
||||
-import androidx.preference.Preference;
|
||||
-
|
||||
-import com.android.settings.R;
|
||||
-import com.android.settings.core.TogglePreferenceController;
|
||||
-
|
||||
-/**
|
||||
- * Preference to enable/disable the large double-line clock on lockscreen
|
||||
- */
|
||||
-public class LockscreenClockPreferenceController extends TogglePreferenceController {
|
||||
-
|
||||
- private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK;
|
||||
-
|
||||
- public LockscreenClockPreferenceController(Context context, String preferenceKey) {
|
||||
- super(context, preferenceKey);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isChecked() {
|
||||
- return Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1) != 0;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean setChecked(boolean isChecked) {
|
||||
- return Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY,
|
||||
- isChecked ? 1 : 0);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public CharSequence getSummary() {
|
||||
- return mContext.getText(R.string.lockscreen_double_line_clock_summary);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public int getAvailabilityStatus() {
|
||||
- return AVAILABLE;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void updateState(Preference preference) {
|
||||
- super.updateState(preference);
|
||||
- preference.setEnabled(true);
|
||||
- refreshSummary(preference);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public int getSliceHighlightMenuRes() {
|
||||
- return R.string.menu_key_display;
|
||||
- }
|
||||
-}
|
||||
diff --git a/tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java
|
||||
deleted file mode 100644
|
||||
index 94f2dc6655..0000000000
|
||||
--- a/tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java
|
||||
+++ /dev/null
|
||||
@@ -1,90 +0,0 @@
|
||||
-/*
|
||||
- * Copyright (C) 2021 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.display;
|
||||
-
|
||||
-import static com.google.common.truth.Truth.assertThat;
|
||||
-
|
||||
-import android.content.ContentResolver;
|
||||
-import android.content.Context;
|
||||
-import android.provider.Settings;
|
||||
-
|
||||
-import androidx.preference.Preference;
|
||||
-
|
||||
-import org.junit.Before;
|
||||
-import org.junit.Test;
|
||||
-import org.junit.runner.RunWith;
|
||||
-import org.mockito.Mock;
|
||||
-import org.mockito.MockitoAnnotations;
|
||||
-import org.robolectric.RobolectricTestRunner;
|
||||
-import org.robolectric.RuntimeEnvironment;
|
||||
-
|
||||
-@RunWith(RobolectricTestRunner.class)
|
||||
-public class LockscreenClockPreferenceControllerTest {
|
||||
-
|
||||
- private static final String TEST_KEY = "test_key";
|
||||
- private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK;
|
||||
-
|
||||
- private Context mContext;
|
||||
- private ContentResolver mContentResolver;
|
||||
- private LockscreenClockPreferenceController mController;
|
||||
-
|
||||
- @Mock
|
||||
- private Preference mPreference;
|
||||
-
|
||||
- @Before
|
||||
- public void setUp() {
|
||||
- MockitoAnnotations.initMocks(this);
|
||||
- mContext = RuntimeEnvironment.application;
|
||||
- mContentResolver = mContext.getContentResolver();
|
||||
- mController = new LockscreenClockPreferenceController(mContext, TEST_KEY);
|
||||
- }
|
||||
-
|
||||
- @Test
|
||||
- public void isChecked_SettingIs1_returnTrue() {
|
||||
- Settings.Secure.putInt(mContentResolver, SETTING_KEY, 1);
|
||||
-
|
||||
- assertThat(mController.isChecked()).isTrue();
|
||||
- }
|
||||
-
|
||||
- @Test
|
||||
- public void isChecked_SettingIs0_returnFalse() {
|
||||
- Settings.Secure.putInt(mContentResolver, SETTING_KEY, 0);
|
||||
-
|
||||
- assertThat(mController.isChecked()).isFalse();
|
||||
- }
|
||||
-
|
||||
- @Test
|
||||
- public void isChecked_SettingIsNotSet_returnTrue() {
|
||||
- Settings.Secure.putString(mContentResolver, SETTING_KEY, null);
|
||||
-
|
||||
- assertThat(mController.isChecked()).isTrue();
|
||||
- }
|
||||
-
|
||||
- @Test
|
||||
- public void setChecked_true_SettingIsNot0() {
|
||||
- mController.setChecked(true);
|
||||
-
|
||||
- assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isNotEqualTo(0);
|
||||
- }
|
||||
-
|
||||
- @Test
|
||||
- public void setChecked_false_SettingIs0() {
|
||||
- mController.setChecked(false);
|
||||
-
|
||||
- assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isEqualTo(0);
|
||||
- }
|
||||
-}
|
||||
--
|
||||
2.34.1
|
||||
|
||||
Reference in New Issue
Block a user