Skip to content

Commit d8ff2ff

Browse files
!fixup Settings: Notch-city: Add 3 mode display cutout handler [3/3]
*nuke unnecessary preference controller *Also hide cutout settings for devices with no notch Signed-off-by: Himanshu Kharkar <himanshu.kharkar20@gmail.com>
1 parent 542b15b commit d8ff2ff

4 files changed

Lines changed: 55 additions & 54 deletions

File tree

res/xml/display_settings.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,11 @@
9494
android:summary="@string/summary_placeholder"
9595
settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController" />
9696

97-
<!--ListPreference
98-
android:icon="@drawable/ic_settings_notch_display"
99-
android:key="display_cutout_emulation"
100-
android:title="@string/display_cutout_emulation"
101-
settings:keywords="@string/display_cutout_emulation_keywords" /-->
102-
10397
<Preference
10498
android:key="cutout_settings"
10599
android:fragment="com.android.settings.display.CutoutFragment"
106100
android:icon="@drawable/ic_settings_notch_display"
101+
settings:controller="com.android.settings.display.CutoutPreferenceController"
107102
android:title="@string/cutout_main" />
108103

109104
<SwitchPreference

src/com/android/settings/DisplaySettings.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import com.android.settings.display.ThemePreferenceController;
3535
import com.android.settings.display.TimeoutPreferenceController;
3636
import com.android.settings.display.VrDisplayPreferenceController;
37-
import com.android.settings.display.EmulateDisplayCutoutPreferenceController;
3837
import com.android.settings.search.BaseSearchIndexProvider;
3938
import com.android.settingslib.core.AbstractPreferenceController;
4039
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -94,7 +93,6 @@ private static List<AbstractPreferenceController> buildPreferenceControllers(
9493
controllers.add(new VrDisplayPreferenceController(context));
9594
controllers.add(new ShowOperatorNamePreferenceController(context));
9695
controllers.add(new ThemePreferenceController(context));
97-
controllers.add(new EmulateDisplayCutoutPreferenceController(context));
9896
controllers.add(new BrightnessLevelPreferenceController(context, lifecycle));
9997
return controllers;
10098
}
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
* Copyright (C) 2021 Wave-OS
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.android.settings.display;
18+
19+
import android.content.Context;
20+
21+
import androidx.preference.Preference;
22+
import androidx.preference.PreferenceScreen;
23+
24+
import com.android.settings.core.BasePreferenceController;
25+
import com.android.settingslib.core.lifecycle.LifecycleObserver;
26+
import com.android.settingslib.core.lifecycle.events.OnResume;
27+
28+
public class CutoutPreferenceController extends BasePreferenceController implements
29+
LifecycleObserver, OnResume {
30+
31+
private Preference mPreference;
32+
33+
public CutoutPreferenceController(Context context, String key) {
34+
super(context, key);
35+
}
36+
37+
@Override
38+
public void displayPreference(PreferenceScreen screen) {
39+
super.displayPreference(screen);
40+
mPreference = screen.findPreference(getPreferenceKey());
41+
}
42+
43+
@Override
44+
public int getAvailabilityStatus() {
45+
return mContext.getResources().getString(
46+
com.android.internal.R.string.config_mainBuiltInDisplayCutout
47+
) != "" ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
48+
}
49+
50+
@Override
51+
public void onResume() {
52+
mPreference.setVisible(isAvailable());
53+
}
54+
}

src/com/android/settings/display/EmulateDisplayCutoutPreferenceController.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)