Merge "Add contrast setting in dev options" into udc-dev

This commit is contained in:
Lucas Dupin
2023-04-05 02:08:14 +00:00
committed by Android (Google) Code Review
6 changed files with 199 additions and 0 deletions

View File

@@ -19,6 +19,7 @@ package com.android.settings.development;
import static android.service.quicksettings.TileService.ACTION_QS_TILE_PREFERENCES;
import android.app.Activity;
import android.app.UiModeManager;
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothA2dp;
import android.bluetooth.BluetoothAdapter;
@@ -63,6 +64,7 @@ import com.android.settings.development.storage.SharedDataPreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.actionbar.SearchMenuController;
import com.android.settings.theme.ContrastPreferenceController;
import com.android.settings.widget.SettingsMainSwitchBar;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -685,6 +687,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new IngressRateLimitPreferenceController((context)));
controllers.add(new BackAnimationPreferenceController(context, fragment));
controllers.add(new PhantomProcessPreferenceController(context));
controllers.add(new ContrastPreferenceController(
context, context.getSystemService(UiModeManager.class)));
return controllers;
}

View File

@@ -0,0 +1,66 @@
/*
* 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.
*/
package com.android.settings.theme
import android.app.UiModeManager
import android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_HIGH
import android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_MEDIUM
import android.app.UiModeManager.ContrastUtils.toContrastLevel
import android.content.Context
import android.content.Intent
import android.os.UserHandle
import android.text.TextUtils
import androidx.preference.Preference
import com.android.internal.annotations.VisibleForTesting
import com.android.settings.R
import com.android.settings.core.BasePreferenceController
/**
* Controller that opens the contrast dialog and updates the text describing the current contrast
*/
class ContrastPreferenceController(
private val context: Context,
private val uiModeManager: UiModeManager) : BasePreferenceController(context, KEY) {
companion object {
@VisibleForTesting
const val KEY = "contrast_preference"
}
override fun getAvailabilityStatus(): Int {
return AVAILABLE
}
override fun handlePreferenceTreeClick(preference: Preference): Boolean {
if (TextUtils.equals(preference.key, preferenceKey)) {
val intent = Intent(Intent.ACTION_SHOW_CONTRAST_DIALOG)
context.startActivityAsUser(intent, UserHandle(UserHandle.USER_CURRENT))
return true
}
return false
}
override fun getSummary(): CharSequence = getSummary(toContrastLevel(uiModeManager.contrast))
@VisibleForTesting
fun getSummary(contrast: Int): String {
return when (contrast) {
CONTRAST_LEVEL_HIGH -> context.getString(R.string.contrast_high)
CONTRAST_LEVEL_MEDIUM -> context.getString(R.string.contrast_medium)
else -> context.getString(R.string.contrast_standard)
}
}
}