Snap for 7080714 from 87e5c697fa125f7afc4a723b8398f1fa079fe00a to rvc-qpr3-release (080c5d82) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/res/layout/car_top_navigation_bar.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -77,8 +77,8 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@null"
		systemui:intent="intent:#Intent;component=com.android.car.settings/.common.CarSettingActivities$QuickSettingActivity;launchFlags=0x24000000;end"
		/>
		android:focusedByDefault="true"
		systemui:intent="intent:#Intent;component=com.android.car.settings/.common.CarSettingActivities$QuickSettingActivity;launchFlags=0x24000000;end"/>
		<com.android.systemui.statusbar.policy.Clock
		android:id="@+id/clock"
		android:layout_width="wrap_content"

packages/CarSystemUI/res/layout/car_top_navigation_bar_unprovisioned.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,8 @@
		android:id="@+id/qs"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@null"/>
		android:background="@null"
		android:focusedByDefault="true"/>
		<com.android.systemui.statusbar.policy.Clock
		android:id="@+id/clock"
		android:layout_width="wrap_content"

packages/SettingsLib/res/values-or/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@
		<string name="bluetooth_hearing_aid_profile_summary_use_for" msgid="7689393730163320483">"ଶ୍ରବଣ ଯନ୍ତ୍ର ପାଇଁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
		<string name="bluetooth_pairing_accept" msgid="2054232610815498004">"ପେୟାର୍‌"</string>
		<string name="bluetooth_pairing_accept_all_caps" msgid="2734383073450506220">"ପେୟାର୍‌"</string>
		<string name="bluetooth_pairing_decline" msgid="6483118841204885890">"କ୍ୟାନ୍ସଲ୍‌ କରନ୍ତୁ"</string>
		<string name="bluetooth_pairing_decline" msgid="6483118841204885890">"ବାତିଲ୍‌ କରନ୍ତୁ"</string>
		<string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"ପେୟାରିଂ ଫଳରେ ସଂଯୁକ୍ତ ଥିବା ବେଳେ ଆପଣଙ୍କ ସମ୍ପର୍କଗୁଡ଼ିକୁ ଏବଂ କଲ୍‌ର ଇତିବୃତିକୁ ଆକସେସ୍‌ ମଞ୍ଜୁର ହୁଏ।"</string>
		<string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ସହ ପେୟାର୍‌ କରିହେଲା ନାହିଁ।"</string>
		<string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"ଏକ ଭୁଲ୍‌ PIN କିମ୍ବା ପାସକୀ କାରଣରୁ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ସହ ପେୟାର୍‌ କରିପାରିଲା ନାହିଁ।"</string>
		@@ -493,7 +493,7 @@
		</plurals>
		<string name="accessibility_manual_zen_more_time" msgid="5141801092071134235">"ଅଧିକ ସମୟ।"</string>
		<string name="accessibility_manual_zen_less_time" msgid="6828877595848229965">"କମ୍ ସମୟ।"</string>
		<string name="cancel" msgid="5665114069455378395">"କ୍ୟାନ୍ସଲ୍"</string>
		<string name="cancel" msgid="5665114069455378395">"ବାତିଲ୍"</string>
		<string name="okay" msgid="949938843324579502">"ଠିକ୍‌ ଅଛି"</string>
		<string name="zen_mode_enable_dialog_turn_on" msgid="6418297231575050426">"ଚାଲୁ କରନ୍ତୁ"</string>
		<string name="zen_mode_settings_turn_on_dialog_title" msgid="2760567063190790696">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଅନ୍ କରନ୍ତୁ"</string>

packages/SettingsLib/res/values-zh-rCN/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@
		<string name="adb_pair_method_qrcode_title" msgid="6982904096137468634">"使用二维码配对设备"</string>
		<string name="adb_pair_method_qrcode_summary" msgid="7130694277228970888">"使用二维码扫描器配对新设备"</string>
		<string name="adb_pair_method_code_title" msgid="1122590300445142904">"使用配对码配对设备"</string>
		<string name="adb_pair_method_code_summary" msgid="6370414511333685185">"使用六位数验证码配对新设备"</string>
		<string name="adb_pair_method_code_summary" msgid="6370414511333685185">"使用六位数的配对码配对新设备"</string>
		<string name="adb_paired_devices_title" msgid="5268997341526217362">"已配对的设备"</string>
		<string name="adb_wireless_device_connected_summary" msgid="3039660790249148713">"当前已连接"</string>
		<string name="adb_wireless_device_details_title" msgid="7129369670526565786">"设备详细信息"</string>

services/core/java/com/android/server/display/DisplayModeDirector.java

+27 −8

Original line number	Diff line number	Diff line
		@@ -52,9 +52,12 @@ import com.android.server.display.utils.AmbientFilterFactory;
		import com.android.server.utils.DeviceConfigInterface;

		import java.io.PrintWriter;
		import java.text.SimpleDateFormat;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Date;
		import java.util.List;
		import java.util.Locale;
		import java.util.Objects;

		/**
		@@ -1160,7 +1163,8 @@ public class DisplayModeDirector {
		// mShouldObserveAmbientHighChange is true, screen is on, peak refresh rate
		// changeable and low power mode off. After initialization, these states will
		// be updated from the same handler thread.
		private boolean mDefaultDisplayOn = false;
		private int mDefaultDisplayState = Display.STATE_UNKNOWN;
		private boolean mIsDeviceActive = false;
		private boolean mRefreshRateChangeable = false;
		private boolean mLowPowerModeEnabled = false;

		@@ -1341,7 +1345,8 @@ public class DisplayModeDirector {
		pw.println(" BrightnessObserver");
		pw.println(" mAmbientLux: " + mAmbientLux);
		pw.println(" mBrightness: " + mBrightness);
		pw.println(" mDefaultDisplayOn: " + mDefaultDisplayOn);
		pw.println(" mDefaultDisplayState: " + mDefaultDisplayState);
		pw.println(" mIsDeviceActive: " + mIsDeviceActive);
		pw.println(" mLowPowerModeEnabled: " + mLowPowerModeEnabled);
		pw.println(" mRefreshRateChangeable: " + mRefreshRateChangeable);
		pw.println(" mShouldObserveDisplayLowChange: " + mShouldObserveDisplayLowChange);
		@@ -1567,14 +1572,17 @@ public class DisplayModeDirector {
		private void updateDefaultDisplayState() {
		Display display = mContext.getSystemService(DisplayManager.class)
		.getDisplay(Display.DEFAULT_DISPLAY);
		boolean defaultDisplayOn = display != null && display.getState() != Display.STATE_OFF;
		setDefaultDisplayState(defaultDisplayOn);
		if (display == null) {
		return;
		}

		setDefaultDisplayState(display.getState());
		}

		@VisibleForTesting
		public void setDefaultDisplayState(boolean on) {
		if (mDefaultDisplayOn != on) {
		mDefaultDisplayOn = on;
		public void setDefaultDisplayState(int state) {
		if (mDefaultDisplayState != state) {
		mDefaultDisplayState = state;
		updateSensorStatus();
		}
		}
		@@ -1595,15 +1603,19 @@ public class DisplayModeDirector {
		}

		private boolean isDeviceActive() {
		return mDefaultDisplayOn && mInjector.isDeviceInteractive(mContext);
		mIsDeviceActive = mInjector.isDeviceInteractive(mContext);
		return (mDefaultDisplayState == Display.STATE_ON)
		&& mIsDeviceActive;
		}

		private final class LightSensorEventListener implements SensorEventListener {
		final private static int INJECT_EVENTS_INTERVAL_MS = LIGHT_SENSOR_RATE_MS;
		private float mLastSensorData;
		private long mTimestamp;

		public void dumpLocked(PrintWriter pw) {
		pw.println(" mLastSensorData: " + mLastSensorData);
		pw.println(" mTimestamp: " + formatTimestamp(mTimestamp));
		}

		@Override
		@@ -1627,6 +1639,7 @@ public class DisplayModeDirector {
		}

		long now = SystemClock.uptimeMillis();
		mTimestamp = System.currentTimeMillis();
		if (mAmbientFilter != null) {
		mAmbientFilter.addValue(now, mLastSensorData);
		}
		@@ -1653,6 +1666,12 @@ public class DisplayModeDirector {
		mHandler.removeCallbacks(mInjectSensorEventRunnable);
		}

		private String formatTimestamp(long time) {
		SimpleDateFormat dateFormat =
		new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.US);
		return dateFormat.format(new Date(time));
		}

		private void processSensorData(long now) {
		if (mAmbientFilter != null) {
		mAmbientLux = mAmbientFilter.getEstimate(now);