resolve merge conflicts of e58c7805711b76fcb92fad0b7c4a57651176cf50 to stage-aosp-master (217e5f01) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -11328,6 +11328,14 @@ public final class Settings {
		*/
		public static final String EMERGENCY_AFFORDANCE_NEEDED = "emergency_affordance_needed";

		/**
		* Enable faster emergency phone call feature.
		* The value is a boolean (1 or 0).
		* @hide
		*/
		public static final String FASTER_EMERGENCY_PHONE_CALL_ENABLED =
		"faster_emergency_phone_call_enabled";

		/**
		* See RIL_PreferredNetworkType in ril.h
		* @hide

+2 −0

Original line number	Diff line number	Diff line
		@@ -2609,6 +2609,7 @@
		"silent" = silent mode
		"users" = list of users
		"restart" = restart device
		"emergency" = Launch emergency dialer
		"lockdown" = Lock down device until the user authenticates
		"logout" = Logout the current user
		-->
		@@ -2619,6 +2620,7 @@
		<item>logout</item>
		<item>bugreport</item>
		<item>screenshot</item>
		<item>emergency</item>
		</string-array>

		<!-- Number of milliseconds to hold a wake lock to ensure that drawing is fully

+1 −0

Original line number	Diff line number	Diff line
		@@ -239,6 +239,7 @@ public class SettingsBackupTest {
		Settings.Global.EUICC_SUPPORTED_COUNTRIES,
		Settings.Global.EUICC_FACTORY_RESET_TIMEOUT_MILLIS,
		Settings.Global.FANCY_IME_ANIMATIONS,
		Settings.Global.FASTER_EMERGENCY_PHONE_CALL_ENABLED,
		Settings.Global.FORCE_ALLOW_ON_EXTERNAL,
		Settings.Global.FORCED_APP_STANDBY_ENABLED,
		Settings.Global.FORCED_APP_STANDBY_FOR_SMALL_BATTERY_ENABLED,

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2018 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.
		-->
		<!-- TODO: For demo only, will change content after UI team provide new faster emergency icon. -->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?attr/colorControlNormal">
		<path
		android:fillColor="#D93025"
		android:pathData="M0,0h24v24H0z" />
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M19,3H5c-1.1,0-1.99,0.9,-1.99,2L3,19c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5c0-1.1-0.9-2-2-2zm-1,11h-4v4h-4v-4H6v-4h4V6h4v4h4v4z" />

		</vector>

+16 −2

Original line number	Diff line number	Diff line
		@@ -3,7 +3,9 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="top\|right"
		android:layout_marginBottom="0dp"
		android:orientation="vertical"
		android:paddingTop="@dimen/global_actions_top_padding"
		android:clipToPadding="false"
		android:theme="@style/qs_theme"
		@@ -17,7 +19,19 @@
		android:layout_gravity="top\|right"
		android:gravity="center"
		android:orientation="vertical"
		android:padding="12dp"
		android:translationZ="9dp" />
		android:padding="@dimen/global_actions_padding"
		android:translationZ="@dimen/global_actions_translate" />

		<!-- For separated button-->
		<FrameLayout
		android:id="@+id/separated_button"
		android:layout_width="@dimen/global_actions_panel_width"
		android:layout_height="wrap_content"
		android:layout_gravity="top\|right"
		android:layout_marginTop="6dp"
		android:gravity="center"
		android:orientation="vertical"
		android:padding="@dimen/global_actions_padding"
		android:translationZ="@dimen/global_actions_translate" />

		</com.android.systemui.HardwareUiLayout>