diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index 68fdf04e9bb54..cb8c623122525 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -101,7 +101,4 @@ interface IPowerManager // update the uids being synchronized by network socket request manager void updateBlockedUids(int uid, boolean isBlocked); - // temporarily overrides the button brightness settings to allow the user to - // see the effect of a settings change without applying it immediately - void setTemporaryButtonBrightnessSettingOverride(int brightness); } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 21420ea618906..e50834ea9f36d 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5187,40 +5187,6 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean */ public static final String KEY_CAMERA_DOUBLE_TAP_ACTION = "key_camera_double_tap_action"; - /** - * Custom button brightness value for manual mode - * - * @hide - */ - public static final String CUSTOM_BUTTON_BRIGHTNESS = "custom_button_brightness"; - - /** - * use same value for buttons as for screen (manual and auto mode) - * - * @hide - */ - public static final String CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS = - "custom_button_use_screen_brightness"; - - /** - * disable all button brightness (manual and auto mode) - * - * @hide - */ - public static final String BUTTON_BACKLIGHT_ENABLE = "button_backlight_enable"; - - /** - * Timeout value for button lights. 0 = disabled - * @hide - */ - public static final String BUTTON_BACKLIGHT_TIMEOUT = "button_backlight_timeout"; - - /** - * @hide - */ - public static final String BUTTON_BACKLIGHT_ON_TOUCH_ONLY = - "button_backlight_on_touch_only"; - /** * @hide */ @@ -5988,11 +5954,6 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean PRIVATE_SETTINGS.add(KEY_APP_SWITCH_DOUBLE_TAP_ACTION); PRIVATE_SETTINGS.add(KEY_CAMERA_LONG_PRESS_ACTION); PRIVATE_SETTINGS.add(KEY_CAMERA_DOUBLE_TAP_ACTION); - PRIVATE_SETTINGS.add(CUSTOM_BUTTON_BRIGHTNESS); - PRIVATE_SETTINGS.add(CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS); - PRIVATE_SETTINGS.add(BUTTON_BACKLIGHT_ENABLE); - PRIVATE_SETTINGS.add(BUTTON_BACKLIGHT_TIMEOUT); - PRIVATE_SETTINGS.add(BUTTON_BACKLIGHT_ON_TOUCH_ONLY); PRIVATE_SETTINGS.add(FORCE_SHOW_NAVBAR); PRIVATE_SETTINGS.add(ACCENT_COLOR); PRIVATE_SETTINGS.add(SHOW_FOURG); diff --git a/core/res/res/values/nad_config.xml b/core/res/res/values/nad_config.xml index dd20fdb769143..d0a4273121e1f 100644 --- a/core/res/res/values/nad_config.xml +++ b/core/res/res/values/nad_config.xml @@ -81,10 +81,6 @@ 0 0 - - false - 128 - false diff --git a/core/res/res/values/nad_symbols.xml b/core/res/res/values/nad_symbols.xml index 1db8940c7642c..74c6ab9c61ac0 100644 --- a/core/res/res/values/nad_symbols.xml +++ b/core/res/res/values/nad_symbols.xml @@ -55,10 +55,6 @@ - - - - diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 4c214b529b39a..430ad1c246049 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -447,9 +447,6 @@ NotoSansInscriptionalParthian-Regular.ttf - - NotoSansJavanese-Regular.ttf - NotoSansKaithi-Regular.ttf @@ -625,6 +622,9 @@ NotoSansHatran-Regular.otf + + NotoSansJavanese-Regular.otf + NotoSansLinearA-Regular.otf diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java index 6e27d5cbde2f6..1c4084d24054c 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java @@ -88,11 +88,6 @@ public class SystemSettings { Settings.System.QS_SHOW_BATTERY_PERCENT, Settings.System.VOLUME_ROCKER_WAKE, Settings.System.NAVIGATION_BAR_ARROW_KEYS, - Settings.System.CUSTOM_BUTTON_BRIGHTNESS, - Settings.System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS, - Settings.System.BUTTON_BACKLIGHT_ENABLE, - Settings.System.BUTTON_BACKLIGHT_TIMEOUT, - Settings.System.BUTTON_BACKLIGHT_ON_TOUCH_ONLY, Settings.System.FORCE_SHOW_NAVBAR, Settings.System.ACCENT_COLOR, Settings.System.STATUS_BAR_CUSTOM_HEADER, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java index 4e5fc2f618c03..b1b92afbb215b 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java @@ -222,11 +222,6 @@ public boolean validate(@Nullable String value) { VALIDATORS.put(System.QS_PANEL_BG_USE_NEW_TINT, ANY_INTEGER_VALIDATOR); VALIDATORS.put(System.VOLUME_ROCKER_WAKE, BOOLEAN_VALIDATOR); VALIDATORS.put(System.NAVIGATION_BAR_ARROW_KEYS, BOOLEAN_VALIDATOR); - VALIDATORS.put(System.CUSTOM_BUTTON_BRIGHTNESS, ANY_INTEGER_VALIDATOR); - VALIDATORS.put(System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS, BOOLEAN_VALIDATOR); - VALIDATORS.put(System.BUTTON_BACKLIGHT_ENABLE, BOOLEAN_VALIDATOR); - VALIDATORS.put(System.BUTTON_BACKLIGHT_TIMEOUT, ANY_INTEGER_VALIDATOR); - VALIDATORS.put(System.BUTTON_BACKLIGHT_ON_TOUCH_ONLY, BOOLEAN_VALIDATOR); VALIDATORS.put(System.FORCE_SHOW_NAVBAR, ANY_INTEGER_VALIDATOR); VALIDATORS.put(System.ACCENT_COLOR, ANY_INTEGER_VALIDATOR); VALIDATORS.put(System.STATUS_BAR_CUSTOM_HEADER, BOOLEAN_VALIDATOR); diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 99912428aacc4..4a1136b8ab732 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -141,8 +141,6 @@ public final class PowerManagerService extends SystemService // Message: Sent when an attentive timeout occurs to update the power state. private static final int MSG_ATTENTIVE_TIMEOUT = 5; - private static final int MSG_BUTTON_TIMEOUT = 6; - // Dirty bit: mWakeLocks changed protected static final int DIRTY_WAKE_LOCKS = 1 << 0; // Dirty bit: mWakefulness changed @@ -583,18 +581,6 @@ public final class PowerManagerService extends SystemService // True if we are currently in VR Mode. private boolean mIsVrModeEnabled; - // Button brightness suppport - private boolean mButtonBrightnessSupport = false; - private int mCurrentButtonBrightness = 0; - private int mCustomButtonBrightness = -1; - private boolean mButtonUseScreenBrightness = true; - private boolean mButtonBacklight; - private boolean mButtonBacklightEnable = true; - private boolean mButtonBacklightOnTouchOnly; - private int mButtonTimeout; - private boolean mButtonTimeoutEnabled; - private int mEvent; - // True if we in the process of performing a forceSuspend private boolean mForceSuspendActive; @@ -1200,29 +1186,6 @@ public void systemReady(IAppOpsService appOps) { filter = new IntentFilter(); filter.addAction(Intent.ACTION_DOCK_EVENT); mContext.registerReceiver(new DockReceiver(), filter, null, mHandler); - if (mButtonBrightnessSupport){ - resolver.registerContentObserver( - Settings.System.getUriFor(Settings.System.CUSTOM_BUTTON_BRIGHTNESS), - false, mSettingsObserver, UserHandle.USER_ALL); - resolver.registerContentObserver( - Settings.System.getUriFor(Settings.System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS), - false, mSettingsObserver, UserHandle.USER_ALL); - resolver.registerContentObserver( - Settings.System.getUriFor(Settings.System.BUTTON_BACKLIGHT_ENABLE), - false, mSettingsObserver, UserHandle.USER_ALL); - resolver.registerContentObserver( - Settings.System.getUriFor(Settings.System.FORCE_SHOW_NAVBAR), - false, mSettingsObserver, UserHandle.USER_ALL); - resolver.registerContentObserver( - Settings.Secure.getUriFor(Settings.Secure.HARDWARE_KEYS_ENABLE), - false, mSettingsObserver, UserHandle.USER_ALL); - resolver.registerContentObserver( - Settings.System.getUriFor(Settings.System.BUTTON_BACKLIGHT_TIMEOUT), - false, mSettingsObserver, UserHandle.USER_ALL); - resolver.registerContentObserver( - Settings.System.getUriFor(Settings.System.BUTTON_BACKLIGHT_ON_TOUCH_ONLY), - false, mSettingsObserver, UserHandle.USER_ALL); - } } @VisibleForTesting @@ -1269,10 +1232,6 @@ void readConfigurationLocked() { com.android.internal.R.fraction.config_maximumScreenDimRatio, 1, 1); mSupportsDoubleTapWakeConfig = resources.getBoolean( com.android.internal.R.bool.config_supportDoubleTapWake); - mButtonBrightnessSupport = resources.getBoolean( - com.android.internal.R.bool.config_button_brightness_support); - mCustomButtonBrightness = resources.getInteger( - com.android.internal.R.integer.config_button_brightness_default); } private void updateSettingsLocked() { @@ -1330,7 +1289,6 @@ private void updateSettingsLocked() { Settings.System.SCREEN_BRIGHTNESS_MODE, Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL, UserHandle.USER_CURRENT); - updateButtonLightSettings(); mDirty |= DIRTY_SETTINGS; } @@ -1676,7 +1634,6 @@ private boolean userActivityNoUpdateLocked(long eventTime, int event, int flags, Trace.traceBegin(Trace.TRACE_TAG_POWER, "userActivity"); try { - mEvent = event; if (eventTime > mLastInteractivePowerHintTime && event != PowerManager.USER_ACTIVITY_EVENT_OTHER && event != PowerManager.USER_ACTIVITY_EVENT_TOUCH) { @@ -2346,14 +2303,6 @@ private void updateUserActivitySummaryLocked(long now, int dirty) { if ((dirty & (DIRTY_WAKE_LOCKS | DIRTY_USER_ACTIVITY | DIRTY_WAKEFULNESS | DIRTY_SETTINGS)) != 0) { mHandler.removeMessages(MSG_USER_ACTIVITY_TIMEOUT); - boolean wakeLocksValue = (dirty & DIRTY_WAKE_LOCKS) != 0; - boolean userActivityValue = (dirty & DIRTY_USER_ACTIVITY) != 0; - boolean wakefullnessValue = (dirty & DIRTY_WAKEFULNESS) != 0; - boolean settingsValue = (dirty & DIRTY_SETTINGS) != 0; - - if (DEBUG) { - Slog.d(TAG, "DIRTY_WAKE_LOCKS=" + wakeLocksValue + " DIRTY_USER_ACTIVITY=" + userActivityValue + " DIRTY_WAKEFULNESS=" + wakefullnessValue + " DIRTY_SETTINGS=" + settingsValue); - } long nextTimeout = 0; if (getWakefulnessLocked() == WAKEFULNESS_AWAKE || getWakefulnessLocked() == WAKEFULNESS_DREAMING @@ -2371,16 +2320,6 @@ private void updateUserActivitySummaryLocked(long now, int dirty) { nextTimeout = mLastUserActivityTime + screenOffTimeout - screenDimDuration; if (now < nextTimeout) { - if (mButtonTimeoutEnabled && (userActivityValue || settingsValue)){ - final boolean buttonPressed = mEvent == PowerManager.USER_ACTIVITY_EVENT_BUTTON; - if (mButtonBacklightOnTouchOnly) { - if (buttonPressed) { - triggerButtonTimeoutEvent(now); - } - } else { - triggerButtonTimeoutEvent(now); - } - } mUserActivitySummary = USER_ACTIVITY_SCREEN_BRIGHT; } else { nextTimeout = mLastUserActivityTime + screenOffTimeout; @@ -2969,12 +2908,6 @@ private boolean updateDisplayPowerStateLocked(int dirty) { PowerManager.BRIGHTNESS_INVALID_FLOAT; } - if (mButtonBrightnessSupport) { - if ((dirty & ( DIRTY_USER_ACTIVITY | DIRTY_SETTINGS | DIRTY_ACTUAL_DISPLAY_POWER_STATE_UPDATED)) != 0) { - updateButtonLight(false); - } - } - mDisplayReady = mDisplayManagerInternal.requestPowerState(mDisplayPowerRequest, mRequestWaitForNegativeProximity); mRequestWaitForNegativeProximity = false; @@ -3766,12 +3699,6 @@ private boolean setPowerModeInternal(int mode, boolean enabled) { return mNativeWrapper.nativeSetPowerMode(mode, enabled); } - private void setTemporaryButtonBrightnessSettingOverrideInternal(int brightness) { - if (mButtonBrightnessSupport){ - mLightsManager.getLight(LightsManager.LIGHT_ID_BUTTONS).setBrightness(brightness); - } - } - @VisibleForTesting boolean wasDeviceIdleForInternal(long ms) { synchronized (mLock) { @@ -4539,12 +4466,6 @@ public boolean handleMessage(Message msg) { case MSG_ATTENTIVE_TIMEOUT: handleAttentiveTimeout(); break; - case MSG_BUTTON_TIMEOUT: - if (DEBUG) { - Slog.d(TAG, "button timeout triggered"); - } - updateButtonLight(true); - break; } return true; @@ -5503,28 +5424,6 @@ public void updateBlockedUids(int uid, boolean isBlocked) { } } - /** - * Used by the settings application and brightness control widgets to - * temporarily override the current button brightness setting so that the - * user can observe the effect of an intended settings change without applying - * it immediately. - * - * The override will be canceled when the setting value is next updated. - * - * @param brightness The overridden brightness. - */ - @Override // Binder call - public void setTemporaryButtonBrightnessSettingOverride(int brightness) { - mContext.enforceCallingOrSelfPermission( - android.Manifest.permission.DEVICE_POWER, null); - - final long ident = Binder.clearCallingIdentity(); - try { - setTemporaryButtonBrightnessSettingOverrideInternal(brightness); - } finally { - Binder.restoreCallingIdentity(ident); - } - } } @VisibleForTesting @@ -5720,7 +5619,8 @@ public void setPowerBoost(int boost, int durationMs) { public void setPowerMode(int mode, boolean enabled) { setPowerModeInternal(mode, enabled); } - @Override + + @Override public boolean wasDeviceIdleFor(long ms) { return wasDeviceIdleForInternal(ms); } @@ -5735,107 +5635,4 @@ public boolean interceptPowerKeyDown(KeyEvent event) { return interceptPowerKeyDownInternal(event); } } - - private void updateButtonLightSettings() { - final ContentResolver resolver = mContext.getContentResolver(); - if (mButtonBrightnessSupport){ - mCustomButtonBrightness = Settings.System.getIntForUser( - mContext.getContentResolver(), Settings.System.CUSTOM_BUTTON_BRIGHTNESS, - mCustomButtonBrightness, UserHandle.USER_CURRENT); - mButtonUseScreenBrightness = Settings.System.getIntForUser( - mContext.getContentResolver(), Settings.System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS, - 0, UserHandle.USER_CURRENT) != 0; - mButtonBacklight = Settings.System.getIntForUser( - mContext.getContentResolver(), Settings.System.BUTTON_BACKLIGHT_ENABLE, - 1, UserHandle.USER_CURRENT) != 0; - boolean navbarEnabled = Settings.System.getIntForUser( - mContext.getContentResolver(), Settings.System.FORCE_SHOW_NAVBAR, - 0, UserHandle.USER_CURRENT) != 0; - boolean hwKeysEnabled = Settings.Secure.getIntForUser( - mContext.getContentResolver(), Settings.Secure.HARDWARE_KEYS_ENABLE, - 1, UserHandle.USER_CURRENT) != 0; - mButtonBacklightEnable = mButtonBacklight && !navbarEnabled && hwKeysEnabled; - mButtonBacklightOnTouchOnly = Settings.System.getIntForUser( - mContext.getContentResolver(), Settings.System.BUTTON_BACKLIGHT_ON_TOUCH_ONLY, - 0, UserHandle.USER_CURRENT) != 0; - mButtonTimeout = Settings.System.getIntForUser(resolver, - Settings.System.BUTTON_BACKLIGHT_TIMEOUT, - 0, UserHandle.USER_CURRENT) * 1000; - - mButtonTimeoutEnabled = mButtonTimeout != 0 && mButtonBacklightEnable; - // prevent remaining timout to be triggered - mHandler.removeMessages(MSG_BUTTON_TIMEOUT); - // force it off - it will come back if needed later - updateButtonLight(true); - } - } - - private void updateButtonLight(boolean timeoutEvent) { - if (mDisplayPowerRequest == null){ - return; - } - - if (!mButtonBacklightEnable){ - mCurrentButtonBrightness = 0; - mLightsManager.getLight(LightsManager.LIGHT_ID_BUTTONS).setBrightness(mCurrentButtonBrightness); - return; - } - - if (timeoutEvent) { - if (DEBUG) { - Slog.d(TAG, "button timeout handled"); - } - mCurrentButtonBrightness = 0; - mLightsManager.getLight(LightsManager.LIGHT_ID_BUTTONS).setBrightness(mCurrentButtonBrightness); - return; - } - - final boolean buttonPressed = mEvent == PowerManager.USER_ACTIVITY_EVENT_BUTTON; - boolean buttonlight_on = mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_BRIGHT; - int currentButtonBrightness = 0; - - if (buttonlight_on){ - if (mButtonBacklightOnTouchOnly && mButtonTimeoutEnabled) { - if (buttonPressed) { - currentButtonBrightness = calcButtonLight(); - } else { - currentButtonBrightness = mCurrentButtonBrightness; - } - } else { - currentButtonBrightness = calcButtonLight(); - } - } else { - currentButtonBrightness = 0; - } - mCurrentButtonBrightness = currentButtonBrightness; - - if (DEBUG) { - Slog.d(TAG, "mCurrentButtonBrightness="+mCurrentButtonBrightness); - } - - mLightsManager.getLight(LightsManager.LIGHT_ID_BUTTONS).setBrightness(mCurrentButtonBrightness); - } - - private int calcButtonLight() { - int buttonBrightness = 0; - - if (mCustomButtonBrightness == -1 || mButtonUseScreenBrightness){ - // use same value as screen - buttonBrightness = Settings.System.getInt(mContext.getContentResolver(), - Settings.System.SCREEN_BRIGHTNESS, (int) mScreenBrightnessSettingDefault); - } else { - buttonBrightness = mCustomButtonBrightness; - } - return buttonBrightness; - } - - private void triggerButtonTimeoutEvent(long now) { - mHandler.removeMessages(MSG_BUTTON_TIMEOUT); - if (DEBUG) { - Slog.d(TAG, "button timeout set to " + (now + mButtonTimeout)); - } - Message msg = mHandler.obtainMessage(MSG_BUTTON_TIMEOUT); - msg.setAsynchronous(true); - mHandler.sendMessageAtTime(msg, now + mButtonTimeout); - } }