Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_frameworks_base into v1-u (8b1a0faf) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values-lu/cm_strings.xml

deleted100644 → 0

+0 −39

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="utf-8"?>
	<!--
	/**
	* Copyright (c) 2015, The CyanogenMod Project
	* Copyright (c) 2017-2021 The LineageOS 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.
	*/
	-->
	<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
	<string name="quick_settings_ambient_display_label">Ambiente Schierm</string>
	<string name="accessibility_quick_settings_ambient_display_off">Ambiente Schierm aus.</string>
	<string name="accessibility_quick_settings_ambient_display_on">Ambiente Schierm un.</string>
	<string name="quick_settings_caffeine_label">Koffein</string>
	<string name="accessibility_quick_settings_caffeine_off">Koffein aus.</string>
	<string name="accessibility_quick_settings_caffeine_on">Koffein un.</string>
	<string name="quick_settings_heads_up_label">Pop-Up-Notifikatiounen</string>
	<string name="accessibility_quick_settings_heads_up_off">Pop-Up-Notifikatiounen aus.</string>
	<string name="accessibility_quick_settings_heads_up_on">Pop-Up-Notifikatiounen un.</string>
	<string name="quick_settings_sync_label">Synchronisatioun</string>
	<string name="accessibility_quick_settings_sync_off">Synchronisatioun aus.</string>
	<string name="accessibility_quick_settings_sync_on">Synchronisatioun un.</string>
	<string name="quick_settings_profiles_label">Systemprofiller</string>
	<string name="accessibility_quick_settings_profiles_off">Profiller aus.</string>
	<string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
	<string name="quick_settings_usb_tether_label">USB-Tethering</string>
	<string name="accessibility_dpad_left">Cursor lénks</string>
	<string name="accessibility_dpad_right">Cursor riets</string>
	</resources>

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java

+1 −11

Original line number	Original line	Diff line number	Diff line
	@@ -90,7 +90,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
	private int mShowPercentMode = MODE_DEFAULT;		private int mShowPercentMode = MODE_DEFAULT;
	private String mEstimateText = null;		private String mEstimateText = null;
	private boolean mPluggedIn;		private boolean mPluggedIn;
	private boolean mPresent;
	private boolean mPowerSaveEnabled;		private boolean mPowerSaveEnabled;
	private boolean mIsBatteryDefender;		private boolean mIsBatteryDefender;
	private boolean mIsIncompatibleCharging;		private boolean mIsIncompatibleCharging;
	@@ -396,10 +395,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
	mBatteryEstimateFetcher = fetcher;		mBatteryEstimateFetcher = fetcher;
	}		}

	void setBatteryPresence(boolean isPresent) {
	mPresent = isPresent;
	}

	void setDisplayShieldEnabled(boolean displayShieldEnabled) {		void setDisplayShieldEnabled(boolean displayShieldEnabled) {
	mDisplayShieldEnabled = displayShieldEnabled;		mDisplayShieldEnabled = displayShieldEnabled;
	}		}
	@@ -616,7 +611,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
	mBatteryStateUnknown = isUnknown;		mBatteryStateUnknown = isUnknown;
	updateContentDescription();		updateContentDescription();

	if (mBatteryStateUnknown && mPresent) {		if (mBatteryStateUnknown) {
	mBatteryIconView.setImageDrawable(getUnknownStateDrawable());		mBatteryIconView.setImageDrawable(getUnknownStateDrawable());
	} else {		} else {
	updateDrawable();		updateDrawable();
	@@ -704,10 +699,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
	}		}

	private void updateDrawable() {		private void updateDrawable() {
	if (!mPresent) {
	return;
	}

	switch (getBatteryStyle()) {		switch (getBatteryStyle()) {
	case BATTERY_STYLE_PORTRAIT:		case BATTERY_STYLE_PORTRAIT:
	mBatteryIconView.setImageDrawable(mAccessorizedDrawable);		mBatteryIconView.setImageDrawable(mAccessorizedDrawable);
	@@ -823,7 +814,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
	pw.println(" mBatteryStateUnknown: " + mBatteryStateUnknown);		pw.println(" mBatteryStateUnknown: " + mBatteryStateUnknown);
	pw.println(" mIsIncompatibleCharging: " + mIsIncompatibleCharging);		pw.println(" mIsIncompatibleCharging: " + mIsIncompatibleCharging);
	pw.println(" mPluggedIn: " + mPluggedIn);		pw.println(" mPluggedIn: " + mPluggedIn);
	pw.println(" mPresent: " + mPresent);
	pw.println(" mLevel: " + mLevel);		pw.println(" mLevel: " + mLevel);
	pw.println(" mMode: " + mShowPercentMode);		pw.println(" mMode: " + mShowPercentMode);
	}		}

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -116,13 +116,6 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView>
	}		}
	}		}

	@Override
	public void onBatteryPresentChanged(boolean batteryPresent) {
	mView.setBatteryPresence(batteryPresent);
	mView.setVisibility(!batteryPresent \|\| mBatteryHidden
	? View.GONE : View.VISIBLE);
	}

	@Override		@Override
	public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {		public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
	pw.print(super.toString());		pw.print(super.toString());
	@@ -169,12 +162,8 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView>
	mBatteryController = batteryController;		mBatteryController = batteryController;

	mView.setBatteryEstimateFetcher(mBatteryController::getEstimatedTimeRemainingString);		mView.setBatteryEstimateFetcher(mBatteryController::getEstimatedTimeRemainingString);
	mView.setBatteryPresence(mBatteryController.isPresent());
	mView.setDisplayShieldEnabled(		mView.setDisplayShieldEnabled(
	getContext().getResources().getBoolean(R.bool.flag_battery_shield_icon));		getContext().getResources().getBoolean(R.bool.flag_battery_shield_icon));
	if (!mBatteryController.isPresent()) {
	mView.setVisibility(View.GONE);
	}

	mSlotBattery = getResources().getString(com.android.internal.R.string.status_bar_battery);		mSlotBattery = getResources().getString(com.android.internal.R.string.status_bar_battery);
	mSettingObserver = new SettingObserver(mMainHandler);		mSettingObserver = new SettingObserver(mMainHandler);

packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -81,11 +81,6 @@ public interface BatteryController extends DemoMode,
	return false;		return false;
	}		}

	/**
	* Returns {@code true} if there's a battery present in the device.
	*/
	default boolean isPresent() { return true; }

	/**		/**
	* Returns {@code true} if the device is currently in power save mode.		* Returns {@code true} if the device is currently in power save mode.
	*/		*/
	@@ -170,9 +165,6 @@ public interface BatteryController extends DemoMode,
	default void onIsIncompatibleChargingChanged(boolean isIncompatibleCharging) {		default void onIsIncompatibleChargingChanged(boolean isIncompatibleCharging) {
	}		}

	default void onBatteryPresentChanged(boolean batteryPresent) {
	}

	@Override		@Override
	default void dump(@NonNull PrintWriter pw, @NonNull String[] args) {		default void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
	pw.println(this);		pw.println(this);

packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java

+0 −18

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC

	protected int mLevel;		protected int mLevel;
	protected boolean mPluggedIn;		protected boolean mPluggedIn;
	protected boolean mPresent;
	private int mPluggedChargingSource;		private int mPluggedChargingSource;
	protected boolean mCharging;		protected boolean mCharging;
	private boolean mStateUnknown = false;		private boolean mStateUnknown = false;
	@@ -177,7 +176,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
	ipw.print("mHasReceivedBattery="); ipw.println(mHasReceivedBattery);		ipw.print("mHasReceivedBattery="); ipw.println(mHasReceivedBattery);
	ipw.print("mLevel="); ipw.println(mLevel);		ipw.print("mLevel="); ipw.println(mLevel);
	ipw.print("mPluggedIn="); ipw.println(mPluggedIn);		ipw.print("mPluggedIn="); ipw.println(mPluggedIn);
	ipw.print("mPresent="); ipw.println(mPresent);
	ipw.print("mCharging="); ipw.println(mCharging);		ipw.print("mCharging="); ipw.println(mCharging);
	ipw.print("mCharged="); ipw.println(mCharged);		ipw.print("mCharged="); ipw.println(mCharged);
	ipw.print("mIsBatteryDefender="); ipw.println(mIsBatteryDefender);		ipw.print("mIsBatteryDefender="); ipw.println(mIsBatteryDefender);
	@@ -228,7 +226,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
	cb.onWirelessChargingChanged(mWirelessCharging);		cb.onWirelessChargingChanged(mWirelessCharging);
	cb.onIsBatteryDefenderChanged(mIsBatteryDefender);		cb.onIsBatteryDefenderChanged(mIsBatteryDefender);
	cb.onIsIncompatibleChargingChanged(mIsIncompatibleCharging);		cb.onIsIncompatibleChargingChanged(mIsIncompatibleCharging);
	cb.onBatteryPresentChanged(mPresent);
	}		}

	@Override		@Override
	@@ -266,11 +263,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
	}		}

	boolean present = intent.getBooleanExtra(EXTRA_PRESENT, true);		boolean present = intent.getBooleanExtra(EXTRA_PRESENT, true);
	if (present != mPresent) {
	mPresent = present;
	fireBatteryPresentChanged();
	}

	boolean unknown = !present;		boolean unknown = !present;
	if (unknown != mStateUnknown) {		if (unknown != mStateUnknown) {
	mStateUnknown = unknown;		mStateUnknown = unknown;
	@@ -343,11 +335,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
	return mPluggedIn;		return mPluggedIn;
	}		}

	@Override
	public boolean isPresent() {
	return mPresent;
	}

	@Override		@Override
	public boolean isPowerSave() {		public boolean isPowerSave() {
	return mPowerSave;		return mPowerSave;
	@@ -497,11 +484,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
	(callback) -> callback.onIsIncompatibleChargingChanged(mIsIncompatibleCharging));		(callback) -> callback.onIsIncompatibleChargingChanged(mIsIncompatibleCharging));
	}		}

	private void fireBatteryPresentChanged() {
	dispatchSafeChange(
	(callback) -> callback.onBatteryPresentChanged(mPresent));
	}

	@Override		@Override
	public void dispatchDemoCommand(String command, Bundle args) {		public void dispatchDemoCommand(String command, Bundle args) {
	if (!mDemoModeController.isInDemoMode()) {		if (!mDemoModeController.isInDemoMode()) {