release-request-05263112-375a-4b1f-a657-a14bb2a5c5a3-for-git_oc-mr1-release-41... (25a12bfa) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+3 −8

Original line number	Diff line number	Diff line
		@@ -2037,6 +2037,7 @@

		<activity android:name=".bluetooth.BluetoothPairingDialog"
		android:excludeFromRecents="true"
		android:windowSoftInputMode="stateVisible\|adjustResize"
		android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">
		<intent-filter android:priority="1">
		<action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
		@@ -2434,8 +2435,7 @@
		android:taskAffinity="">
		<intent-filter android:priority="1">
		<action android:name="android.settings.MOBILE_DATA_USAGE" />
		<category android:name="
		android.intent.category.DEFAULT" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.datausage.DataUsageList" />
		@@ -2495,11 +2495,6 @@
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="10">
		<action android:name="com.android.settings.action.SETTINGS" />
		</intent-filter>
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.apps.default" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.nfc.PaymentSettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		@@ -3000,7 +2995,7 @@
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.apps"/>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.AdvancedAppSettings" />
		android:value="com.android.settings.applications.DefaultAppSettings" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/summary_empty"/>
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

res/layout/data_plans_sync_time_preference.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2017 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.
		-->

		<!-- Shows the data plans sync time -->
		<TextView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@android:id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="@dimen/preference_no_icon_padding_start"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:gravity="end"
		android:textColor="?android:attr/textColorSecondary"/>

res/layout/data_usage_bytes_editor.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@
		android:id="@+id/size_spinner"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:entries="@array/bytes_picker_sizes" />
		android:layout_gravity="center_vertical" />

		</LinearLayout>

res/layout/manage_data_plans_preference.xml

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2017 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.
		-->

		<FrameLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="@dimen/preference_no_icon_padding_start"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingTop="8dp"
		android:paddingBottom="16dp">
		<Button
		android:id="@+id/manage_data_plans"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/data_plan_usage_manage_plans_button_text"
		android:textAllCaps="true"
		style="@style/AppActionPrimaryButton" />
		</FrameLayout>

res/layout/suggestion_condition_footer.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@
		style="@style/SuggestionConditionStyle"
		android:layout_width="match_parent"
		android:layout_height="44dp"
		android:paddingTop="4dp"
		android:paddingEnd="16dp"
		android:paddingTop="10dp"
		android:paddingEnd="10dp"
		android:orientation="horizontal"
		android:gravity="end">