am 5062649a: Merge "Update list item text appearance"
* commit '5062649abac9bf873123fe560fbb7b0748b30a54': Update list item text appearance
This commit is contained in:
@@ -1132,6 +1132,7 @@ package android {
|
||||
field public static final int textAppearanceLargeInverse = 16842819; // 0x1010043
|
||||
field public static final int textAppearanceLargePopupMenu = 16843521; // 0x1010301
|
||||
field public static final int textAppearanceListItem = 16843678; // 0x101039e
|
||||
field public static final int textAppearanceListItemSecondary = 16843838; // 0x101043e
|
||||
field public static final int textAppearanceListItemSmall = 16843679; // 0x101039f
|
||||
field public static final int textAppearanceMedium = 16842817; // 0x1010041
|
||||
field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044
|
||||
|
||||
@@ -533,8 +533,7 @@ public class Preference implements Comparable<Preference> {
|
||||
* @see #onCreateView(ViewGroup)
|
||||
*/
|
||||
protected void onBindView(View view) {
|
||||
final TextView titleView = (TextView) view.findViewById(
|
||||
com.android.internal.R.id.title);
|
||||
final TextView titleView = (TextView) view.findViewById(com.android.internal.R.id.title);
|
||||
if (titleView != null) {
|
||||
final CharSequence title = getTitle();
|
||||
if (!TextUtils.isEmpty(title)) {
|
||||
@@ -557,7 +556,7 @@ public class Preference implements Comparable<Preference> {
|
||||
}
|
||||
}
|
||||
|
||||
ImageView imageView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
|
||||
final ImageView imageView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
|
||||
if (imageView != null) {
|
||||
if (mIconResId != 0 || mIcon != null) {
|
||||
if (mIcon == null) {
|
||||
@@ -570,6 +569,11 @@ public class Preference implements Comparable<Preference> {
|
||||
imageView.setVisibility(mIcon != null ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
|
||||
final View imageFrame = view.findViewById(com.android.internal.R.id.icon_frame);
|
||||
if (imageFrame != null) {
|
||||
imageFrame.setVisibility(mIcon != null ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
|
||||
if (mShouldDisableView) {
|
||||
setEnabledStateOnViews(view, isEnabled());
|
||||
}
|
||||
|
||||
28
core/res/res/layout/preference_category_quantum.xml
Normal file
28
core/res/res/layout/preference_category_quantum.xml
Normal file
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2014 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.
|
||||
-->
|
||||
|
||||
<!-- Layout used for PreferenceCategory in a PreferenceActivity. -->
|
||||
<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:layout_marginBottom="16dip"
|
||||
android:textAppearance="@style/TextAppearance.Quantum.Body2"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:textStyle="bold"
|
||||
android:paddingStart="?attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?attr/listPreferredItemPaddingEnd"
|
||||
android:paddingTop="16dip" />
|
||||
73
core/res/res/layout/preference_child_quantum.xml
Normal file
73
core/res/res/layout/preference_child_quantum.xml
Normal file
@@ -0,0 +1,73 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2014 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.
|
||||
-->
|
||||
|
||||
<!-- Layout for a visually child-like Preference in a PreferenceActivity. -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="?attr/listPreferredItemPaddingStart"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="?attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?attr/listPreferredItemPaddingEnd">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+android:id/icon_frame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:minWidth="58dip"
|
||||
android:gravity="left|center_vertical"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:id="@+android:id/icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dip" />
|
||||
</LinearLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:paddingTop="16dip"
|
||||
android:paddingBottom="16dip">
|
||||
|
||||
<TextView android:id="@+android:id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
|
||||
<TextView android:id="@+android:id/summary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@android:id/title"
|
||||
android:layout_alignStart="@android:id/title"
|
||||
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:maxLines="10" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<!-- Preference should place its actual preference widget here. -->
|
||||
<LinearLayout android:id="@+android:id/widget_frame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:minWidth="58dip"
|
||||
android:gravity="right|center_vertical"
|
||||
android:orientation="vertical" />
|
||||
|
||||
</LinearLayout>
|
||||
74
core/res/res/layout/preference_information_quantum.xml
Normal file
74
core/res/res/layout/preference_information_quantum.xml
Normal file
@@ -0,0 +1,74 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2014 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.
|
||||
-->
|
||||
|
||||
<!-- Layout for a Preference in a PreferenceActivity. The
|
||||
Preference is able to place a specific widget for its particular
|
||||
type in the "widget_frame" layout. -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?android:attr/listPreferredItemHeightSmall"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="?attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?attr/listPreferredItemPaddingEnd">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+android:id/icon_frame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:minWidth="58dip"
|
||||
android:gravity="left|center_vertical"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:id="@+android:id/icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dip" />
|
||||
</LinearLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:paddingTop="16dip"
|
||||
android:paddingBottom="16dip">
|
||||
|
||||
<TextView android:id="@+android:id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
|
||||
<TextView android:id="@+android:id/summary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@android:id/title"
|
||||
android:layout_alignStart="@android:id/title"
|
||||
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:maxLines="10" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<!-- Preference should place its actual preference widget here. -->
|
||||
<LinearLayout android:id="@+android:id/widget_frame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:minWidth="58dip"
|
||||
android:gravity="right|center_vertical"
|
||||
android:orientation="vertical" />
|
||||
|
||||
</LinearLayout>
|
||||
77
core/res/res/layout/preference_quantum.xml
Normal file
77
core/res/res/layout/preference_quantum.xml
Normal file
@@ -0,0 +1,77 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2014 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.
|
||||
-->
|
||||
|
||||
<!-- Layout for a Preference in a PreferenceActivity. The
|
||||
Preference is able to place a specific widget for its particular
|
||||
type in the "widget_frame" layout. -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?android:attr/listPreferredItemHeightSmall"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="?attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?attr/listPreferredItemPaddingEnd"
|
||||
android:background="?android:attr/activatedBackgroundIndicator">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+android:id/icon_frame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:minWidth="58dip"
|
||||
android:gravity="left|center_vertical"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:id="@+android:id/icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:scaleType="centerInside"
|
||||
android:layout_marginEnd="8dip" />
|
||||
</LinearLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:paddingTop="16dip"
|
||||
android:paddingBottom="16dip">
|
||||
|
||||
<TextView android:id="@+android:id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||
android:ellipsize="marquee" />
|
||||
|
||||
<TextView android:id="@+android:id/summary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@android:id/title"
|
||||
android:layout_alignStart="@android:id/title"
|
||||
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:maxLines="10" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<!-- Preference should place its actual preference widget here. -->
|
||||
<LinearLayout android:id="@+android:id/widget_frame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:minWidth="58dip"
|
||||
android:gravity="right|center_vertical"
|
||||
android:orientation="vertical" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -20,6 +20,5 @@
|
||||
android:id="@+android:id/checkbox"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:focusable="false"
|
||||
android:clickable="false" />
|
||||
|
||||
@@ -20,6 +20,5 @@
|
||||
android:id="@+android:id/switchWidget"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:padding="16dip"
|
||||
android:focusable="false" />
|
||||
|
||||
@@ -22,5 +22,4 @@
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||
android:minHeight="?android:attr/listPreferredItemHeightSmall"
|
||||
/>
|
||||
android:minHeight="?android:attr/listPreferredItemHeightSmall" />
|
||||
|
||||
@@ -20,22 +20,19 @@
|
||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||
android:mode="twoLine"
|
||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||
>
|
||||
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
|
||||
|
||||
<TextView android:id="@android:id/text1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dip"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||
/>
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dip"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
|
||||
<TextView android:id="@android:id/text2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@android:id/text1"
|
||||
android:layout_alignStart="@android:id/text1"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
/>
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@android:id/text1"
|
||||
android:layout_alignStart="@android:id/text1"
|
||||
android:textAppearance="?android:attr/textAppearanceListItemSecondary" />
|
||||
|
||||
</TwoLineListItem>
|
||||
|
||||
@@ -22,31 +22,34 @@
|
||||
android:paddingStart="16dip"
|
||||
android:paddingEnd="12dip"
|
||||
android:minHeight="?android:attr/listPreferredItemHeightSmall">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<TextView android:id="@android:id/text1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||
android:textColor="?android:attr/textColorAlertDialogListItem"
|
||||
android:gravity="center_vertical|start"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="marquee"
|
||||
/>
|
||||
android:ellipsize="marquee" />
|
||||
|
||||
<TextView android:id="@android:id/text2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
|
||||
android:textColor="?android:attr/textColorAlertDialogListItem"
|
||||
android:gravity="center_vertical|start"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="marquee"
|
||||
/>
|
||||
android:ellipsize="marquee" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/radio"
|
||||
android:layout_width="35dip"
|
||||
@@ -54,6 +57,6 @@
|
||||
android:paddingEnd="12dip"
|
||||
android:gravity="center_vertical"
|
||||
android:focusable="false"
|
||||
android:clickable="false"
|
||||
/>
|
||||
android:clickable="false" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@@ -23,5 +23,4 @@
|
||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||
android:background="?android:attr/activatedBackgroundIndicator"
|
||||
android:minHeight="?android:attr/listPreferredItemHeightSmall"
|
||||
/>
|
||||
android:minHeight="?android:attr/listPreferredItemHeightSmall" />
|
||||
|
||||
@@ -21,23 +21,20 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?android:attr/activatedBackgroundIndicator"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||
android:mode="twoLine"
|
||||
>
|
||||
android:mode="twoLine">
|
||||
|
||||
<TextView android:id="@android:id/text1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
|
||||
android:layout_marginTop="6dip"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||
/>
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
|
||||
<TextView android:id="@android:id/text2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@android:id/text1"
|
||||
android:layout_alignStart="@android:id/text1"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
/>
|
||||
android:textAppearance="?android:attr/textAppearanceListItemSecondary" />
|
||||
|
||||
</TwoLineListItem>
|
||||
|
||||
@@ -22,5 +22,4 @@
|
||||
android:gravity="center_vertical"
|
||||
android:checkMark="?android:attr/textCheckMark"
|
||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||
/>
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
|
||||
|
||||
@@ -22,5 +22,4 @@
|
||||
android:gravity="center_vertical"
|
||||
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
|
||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||
/>
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
|
||||
|
||||
@@ -22,5 +22,4 @@
|
||||
android:gravity="center_vertical"
|
||||
android:checkMark="?android:attr/listChoiceIndicatorSingle"
|
||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||
/>
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
|
||||
|
||||
@@ -245,6 +245,8 @@
|
||||
|
||||
<!-- The preferred TextAppearance for the primary text of list items. -->
|
||||
<attr name="textAppearanceListItem" format="reference" />
|
||||
<!-- The preferred TextAppearance for the secondary text of list items. -->
|
||||
<attr name="textAppearanceListItemSecondary" format="reference" />
|
||||
<!-- The preferred TextAppearance for the primary text of small list items. -->
|
||||
<attr name="textAppearanceListItemSmall" format="reference" />
|
||||
|
||||
|
||||
@@ -2148,6 +2148,7 @@
|
||||
<public type="attr" name="subtitleTextAppearance" />
|
||||
<public type="attr" name="slideEdge" />
|
||||
<public type="attr" name="actionBarTheme" />
|
||||
<public type="attr" name="textAppearanceListItemSecondary" />
|
||||
|
||||
<public-padding type="dimen" name="l_resource_pad" end="0x01050010" />
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ please see styles_device_defaults.xml.
|
||||
<eat-comment/>
|
||||
|
||||
<style name="Preference.Quantum">
|
||||
<item name="layout">@layout/preference_holo</item>
|
||||
<item name="layout">@layout/preference_quantum</item>
|
||||
</style>
|
||||
|
||||
<style name="PreferenceFragment.Quantum">
|
||||
@@ -42,13 +42,13 @@ please see styles_device_defaults.xml.
|
||||
</style>
|
||||
|
||||
<style name="Preference.Quantum.Information">
|
||||
<item name="layout">@layout/preference_information_holo</item>
|
||||
<item name="layout">@layout/preference_information_quantum</item>
|
||||
<item name="enabled">false</item>
|
||||
<item name="shouldDisableView">false</item>
|
||||
</style>
|
||||
|
||||
<style name="Preference.Quantum.Category">
|
||||
<item name="layout">@layout/preference_category_holo</item>
|
||||
<item name="layout">@layout/preference_category_quantum</item>
|
||||
<!-- The title should not dim if the category is disabled, instead only the preference children should dim. -->
|
||||
<item name="shouldDisableView">false</item>
|
||||
<item name="selectable">false</item>
|
||||
|
||||
@@ -1835,5 +1835,6 @@
|
||||
<java-symbol type="attr" name="titleTextAppearance" />
|
||||
<java-symbol type="attr" name="subtitleTextAppearance" />
|
||||
<java-symbol type="drawable" name="ic_lock_bugreport" />
|
||||
<java-symbol type="id" name="icon_frame" />
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -126,6 +126,7 @@ please see themes_device_defaults.xml.
|
||||
<item name="dropdownListPreferredItemHeight">?android:attr/listPreferredItemHeight</item>
|
||||
<item name="textAppearanceListItem">?android:attr/textAppearanceLarge</item>
|
||||
<item name="textAppearanceListItemSmall">?android:attr/textAppearanceLarge</item>
|
||||
<item name="textAppearanceListItemSecondary">?android:attr/textAppearanceSmall</item>
|
||||
<item name="listPreferredItemPaddingLeft">6dip</item>
|
||||
<item name="listPreferredItemPaddingRight">6dip</item>
|
||||
<item name="listPreferredItemPaddingStart">6dip</item>
|
||||
@@ -702,6 +703,7 @@ please see themes_device_defaults.xml.
|
||||
<item name="itemTextAppearance">@android:style/TextAppearance.Large.Inverse</item>
|
||||
<item name="textAppearanceListItem">@android:style/TextAppearance.Large.Inverse</item>
|
||||
<item name="textAppearanceListItemSmall">@android:style/TextAppearance.Large.Inverse</item>
|
||||
<item name="textAppearanceListItemSecondary">@android:style/TextAppearance.Small.Inverse</item>
|
||||
</style>
|
||||
|
||||
<!-- Default heme for the TimePicker dialog windows, which is used by the
|
||||
@@ -1007,6 +1009,7 @@ please see themes_device_defaults.xml.
|
||||
<item name="listPreferredItemHeightLarge">80dip</item>
|
||||
<item name="dropdownListPreferredItemHeight">?android:attr/listPreferredItemHeightSmall</item>
|
||||
<item name="textAppearanceListItemSmall">?android:attr/textAppearanceMedium</item>
|
||||
<item name="textAppearanceListItemSecondary">?android:attr/textAppearanceSmall</item>
|
||||
<item name="listPreferredItemPaddingLeft">8dip</item>
|
||||
<item name="listPreferredItemPaddingRight">8dip</item>
|
||||
<item name="listPreferredItemPaddingStart">8dip</item>
|
||||
@@ -1337,6 +1340,7 @@ please see themes_device_defaults.xml.
|
||||
<item name="listPreferredItemHeightLarge">80dip</item>
|
||||
<item name="dropdownListPreferredItemHeight">?android:attr/listPreferredItemHeightSmall</item>
|
||||
<item name="textAppearanceListItemSmall">?android:attr/textAppearanceMedium</item>
|
||||
<item name="textAppearanceListItemSecondary">?android:attr/textAppearanceSmall</item>
|
||||
<item name="listPreferredItemPaddingLeft">8dip</item>
|
||||
<item name="listPreferredItemPaddingRight">8dip</item>
|
||||
<item name="listPreferredItemPaddingStart">8dip</item>
|
||||
|
||||
@@ -109,11 +109,13 @@ please see themes_device_defaults.xml.
|
||||
<item name="listPreferredItemHeightSmall">48dip</item>
|
||||
<item name="listPreferredItemHeightLarge">80dip</item>
|
||||
<item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item>
|
||||
<item name="textAppearanceListItemSmall">?attr/textAppearanceMedium</item>
|
||||
<item name="listPreferredItemPaddingLeft">8dip</item>
|
||||
<item name="listPreferredItemPaddingRight">8dip</item>
|
||||
<item name="listPreferredItemPaddingStart">8dip</item>
|
||||
<item name="listPreferredItemPaddingEnd">8dip</item>
|
||||
<item name="textAppearanceListItem">@style/TextAppearance.Quantum.Subhead</item>
|
||||
<item name="textAppearanceListItemSmall">@style/TextAppearance.Quantum.Subhead</item>
|
||||
<item name="textAppearanceListItemSecondary">@style/TextAppearance.Quantum.Body1</item>
|
||||
<item name="listPreferredItemPaddingLeft">16dip</item>
|
||||
<item name="listPreferredItemPaddingRight">16dip</item>
|
||||
<item name="listPreferredItemPaddingStart">16dip</item>
|
||||
<item name="listPreferredItemPaddingEnd">16dip</item>
|
||||
|
||||
<!-- @hide -->
|
||||
<item name="searchResultListItemHeight">58dip</item>
|
||||
@@ -269,6 +271,7 @@ please see themes_device_defaults.xml.
|
||||
<!-- Preference styles -->
|
||||
<item name="preferenceScreenStyle">@style/Preference.Quantum.PreferenceScreen</item>
|
||||
<item name="preferenceFragmentStyle">@style/PreferenceFragment.Quantum</item>
|
||||
<item name="preferenceFragmentPaddingSide">0dip</item>
|
||||
<item name="preferenceCategoryStyle">@style/Preference.Quantum.Category</item>
|
||||
<item name="preferenceStyle">@style/Preference.Quantum</item>
|
||||
<item name="preferenceInformationStyle">@style/Preference.Quantum.Information</item>
|
||||
@@ -278,7 +281,7 @@ please see themes_device_defaults.xml.
|
||||
<item name="dialogPreferenceStyle">@style/Preference.Quantum.DialogPreference</item>
|
||||
<item name="editTextPreferenceStyle">@style/Preference.Quantum.DialogPreference.EditTextPreference</item>
|
||||
<item name="ringtonePreferenceStyle">@style/Preference.Quantum.RingtonePreference</item>
|
||||
<item name="preferenceLayoutChild">@layout/preference_child_holo</item>
|
||||
<item name="preferenceLayoutChild">@layout/preference_child_quantum</item>
|
||||
<item name="detailsElementBackground">?attr/colorBackground</item>
|
||||
|
||||
<!-- Search widget styles -->
|
||||
@@ -442,11 +445,13 @@ please see themes_device_defaults.xml.
|
||||
<item name="listPreferredItemHeightSmall">48dip</item>
|
||||
<item name="listPreferredItemHeightLarge">80dip</item>
|
||||
<item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item>
|
||||
<item name="textAppearanceListItemSmall">?attr/textAppearanceMedium</item>
|
||||
<item name="listPreferredItemPaddingLeft">8dip</item>
|
||||
<item name="listPreferredItemPaddingRight">8dip</item>
|
||||
<item name="listPreferredItemPaddingStart">8dip</item>
|
||||
<item name="listPreferredItemPaddingEnd">8dip</item>
|
||||
<item name="textAppearanceListItem">@style/TextAppearance.Quantum.Subhead</item>
|
||||
<item name="textAppearanceListItemSmall">@style/TextAppearance.Quantum.Subhead</item>
|
||||
<item name="textAppearanceListItemSecondary">@style/TextAppearance.Quantum.Body1</item>
|
||||
<item name="listPreferredItemPaddingLeft">16dip</item>
|
||||
<item name="listPreferredItemPaddingRight">16dip</item>
|
||||
<item name="listPreferredItemPaddingStart">16dip</item>
|
||||
<item name="listPreferredItemPaddingEnd">16dip</item>
|
||||
|
||||
<!-- @hide -->
|
||||
<item name="searchResultListItemHeight">58dip</item>
|
||||
@@ -601,6 +606,7 @@ please see themes_device_defaults.xml.
|
||||
<!-- Preference styles -->
|
||||
<item name="preferenceScreenStyle">@style/Preference.Quantum.PreferenceScreen</item>
|
||||
<item name="preferenceFragmentStyle">@style/PreferenceFragment.Quantum</item>
|
||||
<item name="preferenceFragmentPaddingSide">0dip</item>
|
||||
<item name="preferenceCategoryStyle">@style/Preference.Quantum.Category</item>
|
||||
<item name="preferenceStyle">@style/Preference.Quantum</item>
|
||||
<item name="preferenceInformationStyle">@style/Preference.Quantum.Information</item>
|
||||
@@ -610,7 +616,7 @@ please see themes_device_defaults.xml.
|
||||
<item name="dialogPreferenceStyle">@style/Preference.Quantum.DialogPreference</item>
|
||||
<item name="editTextPreferenceStyle">@style/Preference.Quantum.DialogPreference.EditTextPreference</item>
|
||||
<item name="ringtonePreferenceStyle">@style/Preference.Quantum.RingtonePreference</item>
|
||||
<item name="preferenceLayoutChild">@layout/preference_child_holo</item>
|
||||
<item name="preferenceLayoutChild">@layout/preference_child_quantum</item>
|
||||
<item name="detailsElementBackground">?attr/colorBackground</item>
|
||||
|
||||
<!-- PreferenceFrameLayout attributes -->
|
||||
|
||||
Reference in New Issue
Block a user