PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove more unused theme customization"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-17 00:23:46 +00:00
committed by Android (Google) Code Review
parent e64a75812e dec6b8cd38
commit 20f85d2a27
9 changed files with 5 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/dream_start_button.xml
View File

@@ -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"

11
res/layout/nfc_payment.xml
View File

@@ -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>

87
res/layout/permission_settings.xml
View File

@@ -1,87 +0,0 @@
<?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>

3
res/layout/running_service_details.xml
View File

@@ -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"

2
res/values-sw600dp/dimens.xml
View File

@@ -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>

22
res/values/strings.xml
View File

@@ -4111,32 +4111,10 @@
<string name="app_not_found_dlg_text"> The app wasn\u2019t found in the list of installed apps.</string>
<!-- Manage applications, text for dialog if clear data fails-->
<string name="clear_failed_dlg_text">Couldn\u2019t clear storage for app.</string>
<!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
<string name="security_settings_desc" product="tablet">This app can access the following on your tablet:</string>
<!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
<string name="security_settings_desc" product="default">This app can access the following on your phone:</string>
<!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
This describes the permissions that the application has. It is used when multiple packages are contributing
to the permissions and need to be listed here. -->
<string name="security_settings_desc_multi" product="tablet">This app can access the following on your tablet.
In order to improve performance and reduce memory usage, some of these permissions
are available to <xliff:g id="base_app_name">%1$s</xliff:g>
because it runs in the same process as <xliff:g id="additional_apps_list">%2$s</xliff:g>:</string>
<!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
This describes the permissions that the application has. It is used when multiple packages are contributing
to the permissions and need to be listed here. -->
<string name="security_settings_desc_multi" product="default">This app can access the following on your phone.
In order to improve performance and reduce memory usage, some of these permissions
are available to <xliff:g id="base_app_name">%1$s</xliff:g>
because it runs in the same process as <xliff:g id="additional_apps_list">%2$s</xliff:g>:</string>
<!-- [CHAR_LIMIT=NONE] Format to put together two items in a list. -->
<string name="join_two_items"><xliff:g id="first_item">%1$s</xliff:g> and <xliff:g id="second_item">%2$s</xliff:g></string>
<!-- [CHAR_LIMIT=NONE] Format to put together two unrelated items in a list when "and" is not an appropriate conjunction for these 2 items -->
<string name="join_two_unrelated_items"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="second_item">%2$s</xliff:g></string>
<!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
<string name="security_settings_billing_desc">This app may charge you money:</string>
<!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
<string name="security_settings_premium_sms_desc">Send premium SMS</string>
<string name="computing_size">Computing\u2026</string>
<string name="invalid_size_value">Couldn\u2019t compute package size.</string>
<!-- String displayed when list is empty -->

39
res/values/styles.xml
View File

@@ -56,9 +56,7 @@
<item name="android:layout_width">match_parent</item>
</style>
<style name="TextAppearance" parent="android:TextAppearance.Material">
</style>
<style name="TextAppearance" parent="android:TextAppearance.Material"/>
<style name="TextAppearance.info_label">
<item name="android:textSize">14sp</item>
@@ -94,33 +92,6 @@
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="PreferenceHeaderPanelSinglePane">
<item name="android:layout_marginStart">0dp</item>
<item name="android:layout_marginEnd">0dp</item>
<item name="android:background">@null</item>
</style>
<style name="PreferencePanelSinglePane" parent="@*android:style/PreferencePanel">
<item name="android:layout_marginStart">0dp</item>
<item name="android:layout_marginEnd">0dp</item>
<item name="android:paddingStart">0dp</item>
<item name="android:paddingEnd">0dp</item>
<item name="android:background">@null</item>
<item name="android:scrollbarStyle">outsideOverlay</item>
</style>
<style name="PreferenceHeaderListSinglePane" parent="@*android:style/PreferenceHeaderList">
<item name="android:paddingStart">@dimen/settings_side_margin</item>
<item name="android:paddingEnd">@dimen/settings_side_margin</item>
<item name="android:paddingTop">0dp</item>
<item name="android:paddingBottom">0dp</item>
<item name="android:layout_marginStart">0dp</item>
<item name="android:layout_marginEnd">0dp</item>
<item name="android:layout_marginTop">0dp</item>
<item name="android:layout_marginBottom">0dp</item>
<item name="android:scrollbarStyle">outsideOverlay</item>
</style>
<style name="PreferenceFragmentListSinglePane" parent="@*android:style/PreferenceFragmentList">
<item name="android:paddingStart">@dimen/settings_side_margin</item>
<item name="android:paddingEnd">@dimen/settings_side_margin</item>
@@ -286,9 +257,6 @@
<style name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.Material.Widget.TabWidget" />
<!-- Scrollbar style OUTSIDE_OVERLAY -->
<integer name="preference_scrollbar_style">33554432</integer>
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium" />
<style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small" />
<style name="TextAppearance.Switch" parent="@android:style/TextAppearance.Material.Title">
@@ -300,9 +268,6 @@
</style>
<style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Subhead" />
<style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Material.Body1" />
<style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle" />
<style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle" />
<style name="TextAppearance.SuggestionHeader"
parent="@android:style/TextAppearance.Material.Subhead">
@@ -449,8 +414,6 @@
<style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
<style name="DreamStartButton" parent="android:Widget.DeviceDefault.Button" />
<style name="LockPatternContainerStyle">
<item name="android:maxHeight">400dp</item>
<item name="android:maxWidth">420dp</item>

5
res/values/themes.xml
View File

@@ -206,11 +206,6 @@
<style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="preferenceTheme">@style/PreferenceTheme</item>
<item name="android:listPreferredItemHeight">72dip</item>
<item name="*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
<item name="*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
<item name="*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
<item name="*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item>
<item name="*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>

2
src/com/android/settings/bluetooth/RequestPermissionActivity.java
View File

@@ -49,7 +49,7 @@ public class RequestPermissionActivity extends Activity implements
// adb shell am start -a android.bluetooth.adapter.action.REQUEST_DISCOVERABLE
// adb shell am start -a android.bluetooth.adapter.action.REQUEST_DISABLE
private static final String TAG = "RequestPermissionActivity";
private static final String TAG = "BtRequestPermission";
private static final int MAX_DISCOVERABLE_TIMEOUT = 3600; // 1 hr