Merge "Remove more unused theme customization" (20f85d2a) · Commits · e / os / android_packages_apps_Settings

res/layout/dream_start_button.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@

		<Button
		android:id="@+id/dream_start_now_button"
		style="@style/DreamStartButton"
		style="@style/ActionSecondaryButton"
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="wrap_content"

res/layout/nfc_payment.xml

+1 −10

Original line number	Diff line number	Diff line
		@@ -48,15 +48,6 @@
		android:drawSelectorOnTop="false"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipToPadding="false"
		android:scrollbarStyle="@integer/preference_scrollbar_style" />
		<!--
		<ListView
		android:id="@android:id/list"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipToPadding="false"
		android:scrollbarStyle="@integer/preference_scrollbar_style" />
		-->
		android:clipToPadding="false" />
		</FrameLayout>
		</LinearLayout>

res/layout/permission_settings.xml

deleted100644 → 0

+0 −87

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

		<ScrollView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipToPadding="false"
		android:scrollbarStyle="@integer/preference_scrollbar_style">

		<LinearLayout
		android:id="@+id/all_details"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingBottom="5dip"
		android:orientation="vertical">

		<!-- Permissions section -->
		<LinearLayout
		android:id="@+id/permissions_section"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		<TextView
		style="?android:attr/listSeparatorTextViewStyle"
		android:layout_marginTop="8dip"
		android:text="@string/permissions_label" />
		<TextView android:id="@+id/security_settings_billing_desc"
		android:text="@string/security_settings_billing_desc"
		android:textColor="#ffffb060"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:paddingTop="6dip"
		android:paddingBottom="6dip"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		<LinearLayout
		android:id="@+id/security_settings_billing_list"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/security_settings_premium_sms_desc" />
		<Spinner
		android:id="@+id/security_settings_premium_sms_list"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:spinnerMode="dropdown" />
		</LinearLayout>
		<TextView android:id="@+id/security_settings_desc"
		android:text="@string/security_settings_desc"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:paddingTop="6dip"
		android:paddingBottom="6dip"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		<LinearLayout
		android:id="@+id/security_settings_list"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"/>
		</LinearLayout>


		</LinearLayout>
		</ScrollView>

res/layout/running_service_details.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,7 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipToPadding="false"
		android:scrollbarStyle="@integer/preference_scrollbar_style">
		android:clipToPadding="false">

		<LinearLayout
		android:id="@+id/all_details"

res/values-sw600dp/dimens.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@
		<dimen name="appwidget_min_width">325dip</dimen>
		<dimen name="appwidget_min_height">50dip</dimen>

		<dimen name="settings_side_margin">0dip</dimen>

		<!-- ActionBar contentInsetStart -->
		<dimen name="actionbar_contentInsetStart">24dp</dimen>
		<dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>