Merge master@5406228 into git_qt-dev-plus-aosp. (d09106b2) · Commits · e / os / android_packages_apps_Settings

Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		settings-contextual-card-protos-lite \
		contextualcards \
		settings-logtags \
		statsdprotolite \
		zxing-core-1.7

		LOCAL_PROGUARD_FLAG_FILES := proguard.flags

AndroidManifest.xml

+30 −6

Original line number	Diff line number	Diff line
		@@ -340,7 +340,7 @@
		android:clearTaskOnLaunch="true"
		android:excludeFromRecents="true"
		android:exported="true"
		android:permission="android.permission.CONNECTIVITY_INTERNAL"
		android:permission="android.permission.NETWORK_STACK"
		android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.net.conn.PROMPT_UNVALIDATED" />
		@@ -901,8 +901,7 @@

		<activity android:name=".Settings$MyDeviceInfoActivity"
		android:label="@string/about_settings"
		android:icon="@drawable/ic_homepage_about"
		android:parentActivityName="Settings">
		android:icon="@drawable/ic_homepage_about">
		<intent-filter android:priority="1">
		<action android:name="android.settings.DEVICE_INFO_SETTINGS" />
		<action android:name="android.settings.DEVICE_NAME" />
		@@ -1633,8 +1632,9 @@
		android:icon="@drawable/ic_suggestion_security">
		<intent-filter android:priority="1">
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.DEFAULT" />
		<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
		</intent-filter>
		<meta-data android:name="com.android.settings.dismiss" android:value="14" />
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/suggested_lock_settings_title" />
		<meta-data android:name="com.android.settings.summary"
		@@ -1648,7 +1648,7 @@
		<action android:name="android.intent.action.MAIN" />
		<category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
		</intent-filter>
		<meta-data android:name="com.android.settings.dismiss" android:value="2," />
		<meta-data android:name="com.android.settings.dismiss" android:value="14" />
		<meta-data android:name="com.android.settings.require_feature"
		android:value="android.hardware.fingerprint" />
		<meta-data android:name="com.android.settings.title"
		@@ -2553,7 +2553,7 @@

		<receiver android:name=".sim.SimSelectNotification">
		<intent-filter>
		<action android:name="android.intent.action.SIM_STATE_CHANGED"/>
		<action android:name="android.intent.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED"/>
		</intent-filter>
		</receiver>

		@@ -2622,6 +2622,8 @@
		android:name=".wifi.NetworkRequestDialogActivity"
		android:theme="@style/Transparent"
		android:excludeFromRecents="true"
		android:launchMode="singleTop"
		android:taskAffinity=".wifi.NetworkRequestDialogActivity"
		android:exported="true"
		android:permission="android.permission.NETWORK_SETTINGS">
		<intent-filter>
		@@ -2971,6 +2973,17 @@
		</intent-filter>
		</service>

		<service
		android:name=".development.qstile.DevelopmentTiles$SensorsOff"
		android:label="@string/sensors_off_quick_settings_title"
		android:icon="@drawable/tile_icon_sensors_off"
		android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
		android:enabled="false">
		<intent-filter>
		<action android:name="android.service.quicksettings.action.QS_TILE" />
		</intent-filter>
		</service>

		<activity
		android:name=".HelpTrampoline"
		android:exported="true"
		@@ -3149,6 +3162,17 @@
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.wifi.calling.WifiCallingDisclaimerFragment" />
		</activity>

		<activity android:name="Settings$BatterySaverScheduleSettingsActivity"
		android:label="@string/battery_saver_schedule_settings_title"
		android:parentActivityName="Settings">
		<intent-filter>
		<action android:name="com.android.settings.BATTERY_SAVER_SCHEDULE_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleSettings" />
		</activity>
		<!-- This is the longest AndroidManifest.xml ever. -->
		</application>
		</manifest>

color-check-baseline.xml

+16 −0

Original line number	Diff line number	Diff line
		@@ -1533,6 +1533,22 @@
		column="5"/>
		</issue>

		<issue
		id="HardCodedColor"
		severity="Error"
		message="Avoid using hardcoded color"
		category="Correctness"
		priority="4"
		summary="Using hardcoded color"
		explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes. This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
		errorLine1=" <color name="bt_outline_color">#1f000000</color> <!-- icon outline color -->"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/values/colors.xml"
		line="160"
		column="5"/>
		</issue>

		<issue
		id="HardCodedColor"
		severity="Error"

res/drawable/tile_icon_sensors_off.xml

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2019 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.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:pathData="M21.966,2 L2,22"
		android:strokeLineCap="round"
		android:strokeColor="#000000"
		android:fillColor="#00000000"
		android:strokeWidth="1.6521436"
		android:strokeLineJoin="miter"
		android:strokeAlpha="1"/>
		<path
		android:pathData="M0.752,12L4.496,12l2.496,-6.25 2.496,12.5 2.496,-15 2.496,12.5 2.496,-7.5 1.248,3.75h4.992"
		android:strokeLineCap="round"
		android:strokeColor="#000000"
		android:fillColor="#00000000"
		android:strokeWidth="1.25090861"
		android:strokeLineJoin="round"
		android:strokeAlpha="1"/>
		</vector>

res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -60,10 +60,10 @@
		android:id="@+id/error_message"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="16dp"
		android:textAlignment="center"
		android:layout_marginTop="8dp"
		android:visibility="invisible"
		android:textColor="?android:attr/colorError"/>
		android:textColor="?android:attr/colorError"
		android:visibility="invisible"/>

		</LinearLayout>