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

Commit cb4836b4 authored by Matt Pietal's avatar Matt Pietal
Browse files

[DO NOT MERGE] Allow a settings override for double-line clock 

This setting allows users to always show a single-line format clock,
regardless of notification status.

Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
parent c144f7bb

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -13289,6 +13289,10 @@ 
    <string name="lockscreen_privacy_controls_setting_toggle">Show device controls</string>

    <!-- Device controls summary [CHAR LIMIT=NONE] -->

    <string name="lockscreen_privacy_controls_summary">Access controls when locked</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>









    <!-- Title for RTT setting. [CHAR LIMIT=NONE] -->









    <string name="rtt_settings_title"></string>

























res/xml/security_lockscreen_settings.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -56,6 +56,12 @@







            android:title="@string/lockscreen_privacy_controls_setting_toggle"









            android:summary="@string/lockscreen_privacy_controls_summary"









            settings:controller="com.android.settings.display.ControlsPrivacyPreferenceController" />



















        <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
































src/com/android/settings/display/LockscreenClockPreferenceController.java
0 → 100644



+70
−0






























Original line number
Diff line number
Diff line









/*









 * 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;









    }









}
























tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java
0 → 100644



+90
−0






























Original line number
Diff line number
Diff line









/*









 * 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);









    }









}