diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:44:44 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:44:44 +0000 |
| commit | adb9b6733987e1c97299f687f7d2614a1fe69e9e (patch) | |
| tree | 2401106696ed8f2c6097d5cf7311ea621ddd25db | |
| parent | b97f35bf142fa0da1531ab3ec41b9735e9fd23a7 (diff) | |
| parent | 827a75b49e3b55d5ca27024fc9e3b7c9e48e9b20 (diff) | |
| download | android_frameworks_support-adb9b6733987e1c97299f687f7d2614a1fe69e9e.tar.gz android_frameworks_support-adb9b6733987e1c97299f687f7d2614a1fe69e9e.tar.bz2 android_frameworks_support-adb9b6733987e1c97299f687f7d2614a1fe69e9e.zip | |
Merge tag 'android-6.0.0_r26' into cm-13.0
Android 6.0.0 release 26
53 files changed, 717 insertions, 95 deletions
diff --git a/build.gradle b/build.gradle index f11dd4586a..6a903444da 100644 --- a/build.gradle +++ b/build.gradle @@ -9,8 +9,8 @@ buildscript { } } -ext.supportVersion = '23.0.0' -ext.extraVersion = 17 +ext.supportVersion = '23.0.1' +ext.extraVersion = 19 ext.supportRepoOut = '' ext.buildToolsVersion = '22.1.0' ext.buildNumber = Integer.toString(ext.extraVersion) diff --git a/customtabs/AndroidManifest.xml b/customtabs/AndroidManifest.xml index 14332d7c33..212fab916c 100644 --- a/customtabs/AndroidManifest.xml +++ b/customtabs/AndroidManifest.xml @@ -15,6 +15,6 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="android.support.customtabs"> - <uses-sdk android:minSdkVersion="16"/> + <uses-sdk android:minSdkVersion="15"/> <application /> </manifest> diff --git a/design/res-public/values/public_attrs.xml b/design/res-public/values/public_attrs.xml index 737596bf21..30aa70a547 100644 --- a/design/res-public/values/public_attrs.xml +++ b/design/res-public/values/public_attrs.xml @@ -19,11 +19,14 @@ <public type="attr" name="backgroundTint"/> <public type="attr" name="backgroundTintMode"/> <public type="attr" name="borderWidth"/> + <public type="attr" name="collapsedTitleGravity"/> <public type="attr" name="collapsedTitleTextAppearance"/> <public type="attr" name="contentScrim"/> <public type="attr" name="elevation"/> <public type="attr" name="errorEnabled"/> <public type="attr" name="errorTextAppearance"/> + <public type="attr" name="expanded"/> + <public type="attr" name="expandedTitleGravity"/> <public type="attr" name="expandedTitleMargin"/> <public type="attr" name="expandedTitleMarginBottom"/> <public type="attr" name="expandedTitleMarginEnd"/> @@ -32,9 +35,11 @@ <public type="attr" name="expandedTitleTextAppearance"/> <public type="attr" name="fabSize"/> <public type="attr" name="headerLayout"/> + <public type="attr" name="hintAnimationEnabled"/> <public type="attr" name="hintTextAppearance"/> <public type="attr" name="itemBackground"/> <public type="attr" name="itemIconTint"/> + <public type="attr" name="itemTextAppearance"/> <public type="attr" name="itemTextColor"/> <public type="attr" name="keylines"/> <public type="attr" name="menu"/> @@ -58,5 +63,7 @@ <public type="attr" name="tabSelectedTextColor"/> <public type="attr" name="tabTextAppearance"/> <public type="attr" name="tabTextColor"/> + <public type="attr" name="title"/> + <public type="attr" name="titleEnabled"/> <public type="attr" name="toolbarId"/> </resources> diff --git a/design/res-public/values/public_strings.xml b/design/res-public/values/public_strings.xml new file mode 100644 index 0000000000..d215d5c4cc --- /dev/null +++ b/design/res-public/values/public_strings.xml @@ -0,0 +1,20 @@ +<?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. +--> + +<!-- Definitions of styles to be exposed as public --> +<resources> + <public type="string" name="appbar_scrolling_view_behavior"/> +</resources> diff --git a/design/res-public/values/public_styles.xml b/design/res-public/values/public_styles.xml index f65e5e3427..4ca2050a8f 100644 --- a/design/res-public/values/public_styles.xml +++ b/design/res-public/values/public_styles.xml @@ -16,6 +16,7 @@ <!-- Definitions of styles to be exposed as public --> <resources> + <public type="style" name="TextAppearance.Design.CollapsingToolbar.Expanded"/> <public type="style" name="TextAppearance.Design.Error"/> <public type="style" name="TextAppearance.Design.Hint"/> <public type="style" name="TextAppearance.Design.Tab"/> diff --git a/design/src/android/support/design/widget/CoordinatorLayout.java b/design/src/android/support/design/widget/CoordinatorLayout.java index 656ce56648..708a1235d3 100644 --- a/design/src/android/support/design/widget/CoordinatorLayout.java +++ b/design/src/android/support/design/widget/CoordinatorLayout.java @@ -441,7 +441,7 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen if (mBehaviorTouchView == null) { handled |= super.onTouchEvent(ev); } else if (cancelSuper) { - if (cancelEvent != null) { + if (cancelEvent == null) { final long now = SystemClock.uptimeMillis(); cancelEvent = MotionEvent.obtain(now, now, MotionEvent.ACTION_CANCEL, 0.0f, 0.0f, 0); diff --git a/v14/preference/res/layout-v17/preference_category_material.xml b/v14/preference/res/layout-v17/preference_category_material.xml new file mode 100644 index 0000000000..db3abfe9e5 --- /dev/null +++ b/v14/preference/res/layout-v17/preference_category_material.xml @@ -0,0 +1,27 @@ +<?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 + --> + +<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/Preference_TextAppearanceMaterialBody2" + android:textColor="@color/preference_fallback_accent_color" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingTop="16dip" /> diff --git a/v14/preference/res/layout-v17/preference_information_material.xml b/v14/preference/res/layout-v17/preference_information_material.xml new file mode 100644 index 0000000000..a376c6ad11 --- /dev/null +++ b/v14/preference/res/layout-v17/preference_information_material.xml @@ -0,0 +1,72 @@ +<?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 + --> + +<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="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> + + <LinearLayout + android:id="@+id/icon_frame" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="58dip" + android:gravity="start|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/textAppearanceSmall" + 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="end|center_vertical" + android:orientation="vertical" /> + +</LinearLayout> diff --git a/v14/preference/res/layout-v17/preference_material.xml b/v14/preference/res/layout-v17/preference_material.xml new file mode 100644 index 0000000000..e62477352c --- /dev/null +++ b/v14/preference/res/layout-v17/preference_material.xml @@ -0,0 +1,82 @@ +<?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 + --> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:background="?android:attr/activatedBackgroundIndicator" + android:clipToPadding="false" + android:focusable="true" > + + <LinearLayout + android:id="@+id/icon_frame" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="-4dp" + android:minWidth="60dp" + android:gravity="start|center_vertical" + android:orientation="horizontal" + android:paddingEnd="12dp" + android:paddingTop="4dp" + android:paddingBottom="4dp"> + <android.support.v7.internal.widget.PreferenceImageView + android:id="@android:id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:maxWidth="48dp" + app:maxHeight="48dp" /> + </LinearLayout> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="16dp" + android:paddingBottom="16dp"> + + <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/textAppearanceSmall" + 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:gravity="end|center_vertical" + android:paddingStart="16dp" + android:orientation="vertical" /> + +</LinearLayout> diff --git a/v14/preference/res/layout-v21/preference_category_material.xml b/v14/preference/res/layout-v21/preference_category_material.xml new file mode 100644 index 0000000000..dad9a5cb69 --- /dev/null +++ b/v14/preference/res/layout-v21/preference_category_material.xml @@ -0,0 +1,27 @@ +<?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 + --> + +<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="@android:style/TextAppearance.Material.Body2" + android:textColor="?android:attr/colorAccent" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingTop="16dip" /> diff --git a/v14/preference/res/layout-v21/preference_information_material.xml b/v14/preference/res/layout-v21/preference_information_material.xml new file mode 100644 index 0000000000..1166f4e83a --- /dev/null +++ b/v14/preference/res/layout-v21/preference_information_material.xml @@ -0,0 +1,72 @@ +<?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 + --> + +<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="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> + + <LinearLayout + android:id="@+id/icon_frame" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="58dip" + android:gravity="start|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="end|center_vertical" + android:orientation="vertical" /> + +</LinearLayout> diff --git a/v14/preference/res/layout-v21/preference_material.xml b/v14/preference/res/layout-v21/preference_material.xml index 8d62cc2745..392a2eace8 100644 --- a/v14/preference/res/layout-v21/preference_material.xml +++ b/v14/preference/res/layout-v21/preference_material.xml @@ -24,7 +24,8 @@ android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:background="?android:attr/activatedBackgroundIndicator" - android:clipToPadding="false"> + android:clipToPadding="false" + android:focusable="true" > <LinearLayout android:id="@+id/icon_frame" @@ -38,44 +39,44 @@ android:paddingTop="4dp" android:paddingBottom="4dp"> <android.support.v7.internal.widget.PreferenceImageView - android:id="@+id/icon" + android:id="@android:id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" app:maxWidth="48dp" app:maxHeight="48dp" /> </LinearLayout> - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="16dp" - android:paddingBottom="16dp"> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="16dp" + android:paddingBottom="16dp"> - <TextView android:id="@+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/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="@+id/summary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/title" - android:layout_alignStart="@id/title" - android:textAppearance="?android:attr/textAppearanceListItemSecondary" - android:textColor="?android:attr/textColorSecondary" - android:maxLines="10" /> + <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> + </RelativeLayout> - <!-- Preference should place its actual preference widget here. --> - <LinearLayout android:id="@+id/widget_frame" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:gravity="end|center_vertical" - android:paddingStart="16dp" - android:orientation="vertical" /> + <!-- 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:gravity="end|center_vertical" + android:paddingStart="16dp" + android:orientation="vertical" /> </LinearLayout> diff --git a/v14/preference/res/layout/preference_category_material.xml b/v14/preference/res/layout/preference_category_material.xml new file mode 100644 index 0000000000..e366e7a9c1 --- /dev/null +++ b/v14/preference/res/layout/preference_category_material.xml @@ -0,0 +1,27 @@ +<?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 + --> + +<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/Preference_TextAppearanceMaterialBody2" + android:textColor="@color/preference_fallback_accent_color" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" + android:paddingTop="16dip" /> diff --git a/v14/preference/res/layout/preference_information_material.xml b/v14/preference/res/layout/preference_information_material.xml new file mode 100644 index 0000000000..54a577cf5d --- /dev/null +++ b/v14/preference/res/layout/preference_information_material.xml @@ -0,0 +1,72 @@ +<?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 + --> + +<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:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight"> + + <LinearLayout + android:id="@+id/icon_frame" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="58dip" + android:gravity="start|center_vertical" + android:orientation="horizontal"> + <ImageView + android:id="@android:id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="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_alignLeft="@android:id/title" + android:textAppearance="?android:attr/textAppearanceSmall" + 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="end|center_vertical" + android:orientation="vertical" /> + +</LinearLayout> diff --git a/v14/preference/res/layout/preference_material.xml b/v14/preference/res/layout/preference_material.xml index b9d8f66375..613505350b 100644 --- a/v14/preference/res/layout/preference_material.xml +++ b/v14/preference/res/layout/preference_material.xml @@ -21,24 +21,25 @@ android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeightSmall" android:gravity="center_vertical" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:background="?android:attr/activatedBackgroundIndicator" - android:clipToPadding="false"> + android:clipToPadding="false" + android:focusable="true" > <LinearLayout android:id="@+id/icon_frame" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="-4dp" + android:layout_marginLeft="-4dp" android:minWidth="60dp" android:gravity="start|center_vertical" android:orientation="horizontal" - android:paddingEnd="12dp" + android:paddingRight="12dp" android:paddingTop="4dp" android:paddingBottom="4dp"> <android.support.v7.internal.widget.PreferenceImageView - android:id="@+id/icon" + android:id="@android:id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" app:maxWidth="48dp" @@ -52,18 +53,18 @@ android:paddingTop="16dp" android:paddingBottom="16dp"> - <TextView android:id="@+id/title" + <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="@+id/summary" + <TextView android:id="@android:id/summary" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/title" - android:layout_alignStart="@id/title" + android:layout_below="@android:id/title" + android:layout_alignLeft="@android:id/title" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="?android:attr/textColorSecondary" android:maxLines="10" /> @@ -71,11 +72,11 @@ </RelativeLayout> <!-- Preference should place its actual preference widget here. --> - <LinearLayout android:id="@+id/widget_frame" + <LinearLayout android:id="@android:id/widget_frame" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="end|center_vertical" - android:paddingStart="16dp" + android:paddingLeft="16dp" android:orientation="vertical" /> </LinearLayout> diff --git a/v14/preference/res/values/colors.xml b/v14/preference/res/values/colors.xml new file mode 100644 index 0000000000..cb4f235ca5 --- /dev/null +++ b/v14/preference/res/values/colors.xml @@ -0,0 +1,21 @@ +<?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 + --> + +<resources> + <!-- Fallback color for versions of the system where ?android:attr/colorAccent is not available --> + <color name="preference_fallback_accent_color">#ff80cbc4</color> +</resources> diff --git a/v14/preference/res/values/styles.xml b/v14/preference/res/values/styles.xml index d7cc26866e..daf683cc3a 100644 --- a/v14/preference/res/values/styles.xml +++ b/v14/preference/res/values/styles.xml @@ -22,4 +22,48 @@ <item name="switchTextOff">@string/v7_preference_off</item> </style> + <style name="Preference.Material"> + <item name="layout">@layout/preference_material</item> + </style> + + <style name="Preference.Information.Material"> + <item name="layout">@layout/preference_information_material</item> + <item name="enabled">false</item> + <item name="shouldDisableView">false</item> + </style> + + <style name="Preference.Category.Material"> + <item name="layout">@layout/preference_category_material</item> + </style> + + <style name="Preference.CheckBoxPreference.Material"> + <item name="layout">@layout/preference_material</item> + </style> + + <style name="Preference.SwitchPreferenceCompat.Material"> + <item name="layout">@layout/preference_material</item> + </style> + + <style name="Preference.SwitchPreference.Material"> + <item name="layout">@layout/preference_material</item> + </style> + + <style name="Preference.PreferenceScreen.Material"> + <item name="layout">@layout/preference_material</item> + </style> + + <style name="Preference.DialogPreference.Material"> + <item name="layout">@layout/preference_material</item> + </style> + + <style name="Preference.DialogPreference.EditTextPreference.Material"> + <item name="layout">@layout/preference_material</item> + </style> + + <style name="Preference_TextAppearanceMaterialBody2"> + <item name="android:textSize">14sp</item> + <item name="android:fontFamily">sans-serif-medium</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + </style> + </resources> diff --git a/v14/preference/res/values/themes.xml b/v14/preference/res/values/themes.xml index 88d25d2072..2bfe623f4c 100644 --- a/v14/preference/res/values/themes.xml +++ b/v14/preference/res/values/themes.xml @@ -19,4 +19,16 @@ <style name="PreferenceThemeOverlay.v14"> <item name="switchPreferenceStyle">@style/Preference.SwitchPreference</item> </style> + + <style name="PreferenceThemeOverlay.v14.Material"> + <item name="preferenceScreenStyle">@style/Preference.PreferenceScreen.Material</item> + <item name="preferenceCategoryStyle">@style/Preference.Category.Material</item> + <item name="preferenceStyle">@style/Preference.Material</item> + <item name="preferenceInformationStyle">@style/Preference.Information.Material</item> + <item name="checkBoxPreferenceStyle">@style/Preference.CheckBoxPreference.Material</item> + <item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat.Material</item> + <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.Material</item> + <item name="dialogPreferenceStyle">@style/Preference.DialogPreference.Material</item> + <item name="editTextPreferenceStyle">@style/Preference.DialogPreference.EditTextPreference.Material</item> + </style> </resources> diff --git a/v17/leanback/res/values-bg/strings.xml b/v17/leanback/res/values-bg/strings.xml index de0b6f8823..74c01b61fd 100644 --- a/v17/leanback/res/values-bg/strings.xml +++ b/v17/leanback/res/values-bg/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Търсете"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Говорете, за да търсите"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Търсете в/ъв <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Говорете, за да търсите в/ъв <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Говорете, за да търсите във: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Пускане"</string> diff --git a/v17/leanback/res/values-ca/strings.xml b/v17/leanback/res/values-ca/strings.xml index 187f5afb1a..dbf20a89bb 100644 --- a/v17/leanback/res/values-ca/strings.xml +++ b/v17/leanback/res/values-ca/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Cerca."</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Parla per fer una cerca."</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Cerca a <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>."</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Parla per cercar a <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>."</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Parla per cercar a <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Reprodueix"</string> diff --git a/v17/leanback/res/values-cs/strings.xml b/v17/leanback/res/values-cs/strings.xml index 1a60828341..13f96893e8 100644 --- a/v17/leanback/res/values-cs/strings.xml +++ b/v17/leanback/res/values-cs/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Vyhledávání"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Vyhledávejte hlasem"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Hledat <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Vyhledávejte v kategorii „<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>“ hlasem"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Vyhledávejte v kategorii „<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>“ hlasem"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$d×"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$d×"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Přehrát"</string> diff --git a/v17/leanback/res/values-da/strings.xml b/v17/leanback/res/values-da/strings.xml index e3e0f9fde8..701138f970 100644 --- a/v17/leanback/res/values-da/strings.xml +++ b/v17/leanback/res/values-da/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Søg"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Tal for at søge"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Søg efter <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Tal for at søge efter <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Sig noget for at søge i <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Afspil"</string> diff --git a/v17/leanback/res/values-de/strings.xml b/v17/leanback/res/values-de/strings.xml index d729f7cb72..db0c3e03da 100644 --- a/v17/leanback/res/values-de/strings.xml +++ b/v17/leanback/res/values-de/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Suchen"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Zum Suchen sprechen"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"In <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> suchen"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Zum Suchen in der Kategorie \"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>\" sprechen"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Sprechen, um in \"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>\" zu suchen"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dx"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dx"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Wiedergabe"</string> diff --git a/v17/leanback/res/values-el/strings.xml b/v17/leanback/res/values-el/strings.xml index 9b93dcfc62..6c4f603f21 100644 --- a/v17/leanback/res/values-el/strings.xml +++ b/v17/leanback/res/values-el/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Αναζήτηση"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Μιλήστε για να κάνετε αναζήτηση"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Αναζήτηση <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Μιλήστε για αναζήτηση <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Μιλήστε για αναζήτηση: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Αναπαραγωγή"</string> diff --git a/v17/leanback/res/values-es/strings.xml b/v17/leanback/res/values-es/strings.xml index 0cff1c9f3a..9e6c526684 100644 --- a/v17/leanback/res/values-es/strings.xml +++ b/v17/leanback/res/values-es/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Buscar"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Habla para buscar"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Buscar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Habla para buscar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Habla para buscar en <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Reproducir"</string> diff --git a/v17/leanback/res/values-et-rEE/strings.xml b/v17/leanback/res/values-et-rEE/strings.xml index 32fff96d81..cfda00e9cb 100644 --- a/v17/leanback/res/values-et-rEE/strings.xml +++ b/v17/leanback/res/values-et-rEE/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Otsing"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Öelge otsimiseks"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Otsige teenusest <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Kõnelge teenusest <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> otsimiseks"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Häälotsing: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Esita"</string> diff --git a/v17/leanback/res/values-fi/strings.xml b/v17/leanback/res/values-fi/strings.xml index 9d38d3c300..92b5f12a44 100644 --- a/v17/leanback/res/values-fi/strings.xml +++ b/v17/leanback/res/values-fi/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Haku"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Tee haku puhumalla"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Haku: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Puhehaku: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Hae <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> puhehaulla"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Toista"</string> diff --git a/v17/leanback/res/values-hr/strings.xml b/v17/leanback/res/values-hr/strings.xml index 166369f1b4..974de0af77 100644 --- a/v17/leanback/res/values-hr/strings.xml +++ b/v17/leanback/res/values-hr/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Pretražite"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Izgovorite upit za pretraživanje"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Tražite <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Izgovorite upit za pretraživanje <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Izgovorite upit da pretražite <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Reproduciraj"</string> diff --git a/v17/leanback/res/values-nl/strings.xml b/v17/leanback/res/values-nl/strings.xml index fe7314105e..1925e1483b 100644 --- a/v17/leanback/res/values-nl/strings.xml +++ b/v17/leanback/res/values-nl/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Zoeken"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Spreek om te zoeken"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> zoeken"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Spreek om <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> te zoeken"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Spreek om in <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> te zoeken"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Afspelen"</string> diff --git a/v17/leanback/res/values-pl/strings.xml b/v17/leanback/res/values-pl/strings.xml index f6280a3835..18b8bf67c8 100644 --- a/v17/leanback/res/values-pl/strings.xml +++ b/v17/leanback/res/values-pl/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Szukaj"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Powiedz, aby wyszukać"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Szukaj <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Powiedz, by wyszukać w aplikacji <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Powiedz, by wyszukać <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Odtwórz"</string> diff --git a/v17/leanback/res/values-pt-rBR/strings.xml b/v17/leanback/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000000..79b9d402ea --- /dev/null +++ b/v17/leanback/res/values-pt-rBR/strings.xml @@ -0,0 +1,49 @@ +<?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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="orb_search_action" msgid="5651268540267663887">"Ação de pesquisa"</string> + <string name="lb_search_bar_hint" msgid="8325490927970116252">"Pesquisar"</string> + <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Fale para pesquisar"</string> + <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Fale para pesquisar no <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> + <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> + <string name="lb_playback_controls_play" msgid="731953341987346903">"Reproduzir"</string> + <string name="lb_playback_controls_pause" msgid="6189521112079849518">"Pausar"</string> + <string name="lb_playback_controls_fast_forward" msgid="8569951318244687220">"Avançar"</string> + <string name="lb_playback_controls_fast_forward_multiplier" msgid="1058753672110224526">"Avançar %1$dX"</string> + <string name="lb_playback_controls_rewind" msgid="2227196334132350684">"Retroceder"</string> + <string name="lb_playback_controls_rewind_multiplier" msgid="1640629531440849942">"Retroceder %1$dX"</string> + <string name="lb_playback_controls_skip_next" msgid="2946499493161095772">"Pular próxima"</string> + <string name="lb_playback_controls_skip_previous" msgid="2326801832933178348">"Pular anterior"</string> + <string name="lb_playback_controls_more_actions" msgid="2330770008796987655">"Mais ações"</string> + <string name="lb_playback_controls_thumb_up" msgid="6530420347129222601">"Desmarcar gostei"</string> + <string name="lb_playback_controls_thumb_up_outline" msgid="1577637924003500946">"Marcar gostei"</string> + <string name="lb_playback_controls_thumb_down" msgid="4498041193172964797">"Desmarcar não gostei"</string> + <string name="lb_playback_controls_thumb_down_outline" msgid="2936020280629424365">"Marcar não gostei"</string> + <string name="lb_playback_controls_repeat_none" msgid="87476947476529036">"Não repetir"</string> + <string name="lb_playback_controls_repeat_all" msgid="6730354406289599000">"Repetir tudo"</string> + <string name="lb_playback_controls_repeat_one" msgid="3285202316452203619">"Repetir uma"</string> + <string name="lb_playback_controls_shuffle_enable" msgid="1099874107835264529">"Ativar reprodução aleatória"</string> + <string name="lb_playback_controls_shuffle_disable" msgid="8388150597335115226">"Desativar reprodução aleatória"</string> + <string name="lb_playback_controls_high_quality_enable" msgid="202415780019335254">"Ativar alta qualidade"</string> + <string name="lb_playback_controls_high_quality_disable" msgid="8637371582779057866">"Desativar alta qualidade"</string> + <string name="lb_playback_controls_closed_captioning_enable" msgid="2429655367176440226">"Ativar closed captioning"</string> + <string name="lb_playback_controls_closed_captioning_disable" msgid="6133362019475930048">"Desativar closed captioning"</string> +</resources> diff --git a/v17/leanback/res/values-pt-rPT/strings.xml b/v17/leanback/res/values-pt-rPT/strings.xml index f3bf4aa556..f269712c2f 100644 --- a/v17/leanback/res/values-pt-rPT/strings.xml +++ b/v17/leanback/res/values-pt-rPT/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Pesquisar"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Fale para pesquisar"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Fale para pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Fale para pesquisar no(a) <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Reproduzir"</string> diff --git a/v17/leanback/res/values-pt/strings.xml b/v17/leanback/res/values-pt/strings.xml index 13d01a5165..79b9d402ea 100644 --- a/v17/leanback/res/values-pt/strings.xml +++ b/v17/leanback/res/values-pt/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Pesquisar"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Fale para pesquisar"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Fale para pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Fale para pesquisar no <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Reproduzir"</string> diff --git a/v17/leanback/res/values-ru/strings.xml b/v17/leanback/res/values-ru/strings.xml index fb03f9d22f..fdb453b33c 100644 --- a/v17/leanback/res/values-ru/strings.xml +++ b/v17/leanback/res/values-ru/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Поиск"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Произнесите запрос"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Поиск здесь: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Произнесите запрос, чтобы найти <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Скажите, что вы хотите найти – <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Воспроизвести."</string> diff --git a/v17/leanback/res/values-sl/strings.xml b/v17/leanback/res/values-sl/strings.xml index 1af639be94..b5d0e1d54f 100644 --- a/v17/leanback/res/values-sl/strings.xml +++ b/v17/leanback/res/values-sl/strings.xml @@ -19,9 +19,9 @@ limitations under the License. xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="orb_search_action" msgid="5651268540267663887">"Dejanje iskanja"</string> <string name="lb_search_bar_hint" msgid="8325490927970116252">"Iskanje"</string> - <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Izgovorite, če želite iskati"</string> + <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Izgovorite iskalno poizvedbo"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Iskanje: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Govorite, če želite iskati: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Izgovorite poizvedbo za iskanje v <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$d-kratno"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$d-kratno"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Predvajaj"</string> diff --git a/v17/leanback/res/values-sw/strings.xml b/v17/leanback/res/values-sw/strings.xml index 17c7480062..0ad04d1a25 100644 --- a/v17/leanback/res/values-sw/strings.xml +++ b/v17/leanback/res/values-sw/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Utafutaji"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Tamka ili utafute"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Tafuta <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Tamka ili utafute <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Tamka ili utafute kwenye <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Google Play"</string> diff --git a/v17/leanback/res/values-th/strings.xml b/v17/leanback/res/values-th/strings.xml index 581bac05bf..093a529280 100644 --- a/v17/leanback/res/values-th/strings.xml +++ b/v17/leanback/res/values-th/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"ค้นหา"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"พูดเพื่อค้นหา"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"ค้นหา <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"พูดเพื่อค้นหา <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"พูดเพื่อทำการค้นหาใน <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"เล่น"</string> diff --git a/v17/leanback/res/values-tl/strings.xml b/v17/leanback/res/values-tl/strings.xml index c4e15ec774..a536298741 100644 --- a/v17/leanback/res/values-tl/strings.xml +++ b/v17/leanback/res/values-tl/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Maghanap"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Magsalita upang maghanap"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Hanapin ang <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Magsalita upang hanapin ang <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Magsalita upang maghanap sa <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"I-play"</string> diff --git a/v17/leanback/res/values-tr/strings.xml b/v17/leanback/res/values-tr/strings.xml index 4671058640..800436c4ad 100644 --- a/v17/leanback/res/values-tr/strings.xml +++ b/v17/leanback/res/values-tr/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Ara"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Arama yapmak için konuşun"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Ara: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Aramak için konuşun: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Konuşarak <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> araması yapın"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Oynat"</string> diff --git a/v17/leanback/res/values-uz-rUZ/strings.xml b/v17/leanback/res/values-uz-rUZ/strings.xml index 235d88f1f6..c7612449a8 100644 --- a/v17/leanback/res/values-uz-rUZ/strings.xml +++ b/v17/leanback/res/values-uz-rUZ/strings.xml @@ -28,7 +28,7 @@ limitations under the License. <string name="lb_playback_controls_pause" msgid="6189521112079849518">"To‘xtatib turish"</string> <string name="lb_playback_controls_fast_forward" msgid="8569951318244687220">"Oldinga o‘tkazish"</string> <string name="lb_playback_controls_fast_forward_multiplier" msgid="1058753672110224526">"%1$dX tezlikda oldinga o‘tkazish"</string> - <string name="lb_playback_controls_rewind" msgid="2227196334132350684">"Orqaga qaytarish"</string> + <string name="lb_playback_controls_rewind" msgid="2227196334132350684">"Orqaga o‘tkazish"</string> <string name="lb_playback_controls_rewind_multiplier" msgid="1640629531440849942">"%1$dX tezlikda orqaga qaytarish"</string> <string name="lb_playback_controls_skip_next" msgid="2946499493161095772">"Keyingisiga o‘tish"</string> <string name="lb_playback_controls_skip_previous" msgid="2326801832933178348">"Avvalgisiga qaytish"</string> diff --git a/v17/leanback/res/values-vi/strings.xml b/v17/leanback/res/values-vi/strings.xml index 201d137b28..baf1c44dc8 100644 --- a/v17/leanback/res/values-vi/strings.xml +++ b/v17/leanback/res/values-vi/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"Tìm kiếm"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Nói để tìm kiếm"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Tìm kiếm <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Nói để tìm kiếm <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"Nói để tìm kiếm trên <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$dX"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$dX"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"Phát"</string> diff --git a/v17/leanback/res/values-zh-rCN/strings.xml b/v17/leanback/res/values-zh-rCN/strings.xml index 276e7bb768..17c52b6a67 100644 --- a/v17/leanback/res/values-zh-rCN/strings.xml +++ b/v17/leanback/res/values-zh-rCN/strings.xml @@ -21,7 +21,7 @@ limitations under the License. <string name="lb_search_bar_hint" msgid="8325490927970116252">"搜索"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"说话即可开始搜索"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"搜索<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> - <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"说话即可在<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>中搜索"</string> + <string name="lb_search_bar_hint_with_title_speech" msgid="2712734639766312034">"说出搜索条件，在<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>中进行搜索"</string> <string name="lb_control_display_fast_forward_multiplier" msgid="4541442045214207774">"%1$d 倍速"</string> <string name="lb_control_display_rewind_multiplier" msgid="3097220783222910245">"%1$d 倍速"</string> <string name="lb_playback_controls_play" msgid="731953341987346903">"播放"</string> diff --git a/v4/java/android/support/v4/app/Fragment.java b/v4/java/android/support/v4/app/Fragment.java index d50da02ca7..79f21ff746 100644 --- a/v4/java/android/support/v4/app/Fragment.java +++ b/v4/java/android/support/v4/app/Fragment.java @@ -269,9 +269,12 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener // If set this fragment would like its instance retained across // configuration changes. boolean mRetainInstance; - + // If set this fragment is being retained across the current config change. boolean mRetaining; + + // If set this fragment's loaders are being retained across the current config change. + boolean mRetainLoader; // If set this fragment has menu items to contribute. boolean mHasMenu; @@ -2150,10 +2153,10 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener mLoaderManager = mHost.getLoaderManager(mWho, mLoadersStarted, false); } if (mLoaderManager != null) { - if (!mRetaining) { - mLoaderManager.doStop(); - } else { + if (mRetainLoader) { mLoaderManager.doRetain(); + } else { + mLoaderManager.doStop(); } } } diff --git a/v4/java/android/support/v4/app/FragmentController.java b/v4/java/android/support/v4/app/FragmentController.java index 5d647b061a..dbf9ee71e0 100644 --- a/v4/java/android/support/v4/app/FragmentController.java +++ b/v4/java/android/support/v4/app/FragmentController.java @@ -346,6 +346,7 @@ public class FragmentController { */ public void doLoaderStop(boolean retain) { mHost.doLoaderStop(retain); + mHost.mFragmentManager.setRetainLoader(retain); } /** diff --git a/v4/java/android/support/v4/app/FragmentManager.java b/v4/java/android/support/v4/app/FragmentManager.java index 866bb97d7b..8e1a2fcaa3 100644 --- a/v4/java/android/support/v4/app/FragmentManager.java +++ b/v4/java/android/support/v4/app/FragmentManager.java @@ -428,7 +428,12 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate public void onAnimationStart(Animation animation) { mShouldRunOnHWLayer = shouldRunOnHWLayer(mView, animation); if (mShouldRunOnHWLayer) { - ViewCompat.setLayerType(mView, ViewCompat.LAYER_TYPE_HARDWARE, null); + mView.post(new Runnable() { + @Override + public void run() { + ViewCompat.setLayerType(mView, ViewCompat.LAYER_TYPE_HARDWARE, null); + } + }); } } @@ -436,7 +441,12 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate @CallSuper public void onAnimationEnd(Animation animation) { if (mShouldRunOnHWLayer) { - ViewCompat.setLayerType(mView, ViewCompat.LAYER_TYPE_NONE, null); + mView.post(new Runnable() { + @Override + public void run() { + ViewCompat.setLayerType(mView, ViewCompat.LAYER_TYPE_NONE, null); + } + }); } } @@ -499,9 +509,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate } static boolean shouldRunOnHWLayer(View v, Animation anim) { - // HW layers result in crashes on ICS so we only use it on JB+ - return Build.VERSION.SDK_INT >= 16 - && ViewCompat.getLayerType(v) == ViewCompat.LAYER_TYPE_NONE + return ViewCompat.getLayerType(v) == ViewCompat.LAYER_TYPE_NONE && ViewCompat.hasOverlappingRendering(v) && modifiesAlpha(anim); } @@ -910,6 +918,17 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate } } + void setRetainLoader(boolean retain) { + if (mActive != null) { + for (int i=0; i<mActive.size(); i++) { + Fragment f = mActive.get(i); + if (f != null) { + f.mRetainLoader = retain; + } + } + } + } + void moveToState(Fragment f, int newState, int transit, int transitionStyle, boolean keepActive) { // Fragments that are not currently added will sit in the onCreate() state. @@ -2230,6 +2249,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate fragment.mTag = tag; fragment.mInLayout = true; fragment.mFragmentManager = this; + fragment.mHost = mHost; fragment.onInflate(mHost.getContext(), attrs, fragment.mSavedFragmentState); addFragment(fragment, true); diff --git a/v7/appcompat/res-public/values/public_attrs.xml b/v7/appcompat/res-public/values/public_attrs.xml index 3db510d247..f8fae53fa9 100644 --- a/v7/appcompat/res-public/values/public_attrs.xml +++ b/v7/appcompat/res-public/values/public_attrs.xml @@ -50,13 +50,15 @@ <public type="attr" name="actionViewClass"/> <public type="attr" name="alertDialogStyle"/> <public type="attr" name="alertDialogTheme"/> + <public type="attr" name="arrowHeadLength"/> + <public type="attr" name="arrowShaftLength"/> <public type="attr" name="autoCompleteTextViewStyle"/> <public type="attr" name="background"/> <public type="attr" name="backgroundSplit"/> <public type="attr" name="backgroundStacked"/> <public type="attr" name="backgroundTint"/> <public type="attr" name="backgroundTintMode"/> - <public type="attr" name="barSize"/> + <public type="attr" name="barLength"/> <public type="attr" name="borderlessButtonStyle"/> <public type="attr" name="buttonBarButtonStyle"/> <public type="attr" name="buttonBarNegativeButtonStyle"/> @@ -140,7 +142,6 @@ <public type="attr" name="preserveIconSpacing"/> <public type="attr" name="progressBarPadding"/> <public type="attr" name="progressBarStyle"/> - <public type="attr" name="prompt"/> <public type="attr" name="queryBackground"/> <public type="attr" name="queryHint"/> <public type="attr" name="radioButtonStyle"/> @@ -155,7 +156,6 @@ <public type="attr" name="showText"/> <public type="attr" name="spinBars"/> <public type="attr" name="spinnerDropDownItemStyle"/> - <public type="attr" name="spinnerMode"/> <public type="attr" name="spinnerStyle"/> <public type="attr" name="splitTrack"/> <public type="attr" name="submitBackground"/> @@ -190,7 +190,6 @@ <public type="attr" name="titleTextStyle"/> <public type="attr" name="toolbarNavigationButtonStyle"/> <public type="attr" name="toolbarStyle"/> - <public type="attr" name="topBottomBarArrowSize"/> <public type="attr" name="track"/> <public type="attr" name="voiceIcon"/> <public type="attr" name="windowActionBar"/> diff --git a/v7/appcompat/res/values-fa/strings.xml b/v7/appcompat/res/values-fa/strings.xml index ae4eb857cd..28c76b4aa6 100644 --- a/v7/appcompat/res/values-fa/strings.xml +++ b/v7/appcompat/res/values-fa/strings.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="abc_action_mode_done" msgid="4076576682505996667">"انجام شد"</string> + <string name="abc_action_mode_done" msgid="4076576682505996667">"تمام"</string> <string name="abc_action_bar_home_description" msgid="4600421777120114993">"پیمایش به صفحه اصلی"</string> <string name="abc_action_bar_up_description" msgid="1594238315039666878">"پیمایش به بالا"</string> <string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"گزینههای بیشتر"</string> diff --git a/v7/appcompat/res/values-pt-rBR/strings.xml b/v7/appcompat/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000000..dfcfce80a5 --- /dev/null +++ b/v7/appcompat/res/values-pt-rBR/strings.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="abc_action_mode_done" msgid="4076576682505996667">"Concluído"</string> + <string name="abc_action_bar_home_description" msgid="4600421777120114993">"Navegar para a página inicial"</string> + <string name="abc_action_bar_up_description" msgid="1594238315039666878">"Navegar para cima"</string> + <string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Mais opções"</string> + <string name="abc_toolbar_collapse_description" msgid="1603543279005712093">"Recolher"</string> + <string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s, %2$s"</string> + <string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s, %3$s"</string> + <string name="abc_searchview_description_search" msgid="8264924765203268293">"Pesquisar"</string> + <string name="abc_search_hint" msgid="7723749260725869598">"Pesquisar..."</string> + <string name="abc_searchview_description_query" msgid="2550479030709304392">"Consulta de pesquisa"</string> + <string name="abc_searchview_description_clear" msgid="3691816814315814921">"Limpar consulta"</string> + <string name="abc_searchview_description_submit" msgid="8928215447528550784">"Enviar consulta"</string> + <string name="abc_searchview_description_voice" msgid="893419373245838918">"Pesquisa por voz"</string> + <string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"Selecione um app"</string> + <string name="abc_activity_chooser_view_see_all" msgid="7468859129482906941">"Ver tudo"</string> + <string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"Compartilhar com %s"</string> + <string name="abc_shareactionprovider_share_with" msgid="3421042268587513524">"Compartilhar com"</string> + <string name="status_bar_notification_info_overflow" msgid="2869576371154716097">"999+"</string> +</resources> diff --git a/v7/appcompat/res/values-uz-rUZ/strings.xml b/v7/appcompat/res/values-uz-rUZ/strings.xml index fa884f7c2e..aa222b69cb 100644 --- a/v7/appcompat/res/values-uz-rUZ/strings.xml +++ b/v7/appcompat/res/values-uz-rUZ/strings.xml @@ -23,7 +23,7 @@ <string name="abc_toolbar_collapse_description" msgid="1603543279005712093">"Yig‘ish"</string> <string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s, %2$s"</string> <string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s, %3$s"</string> - <string name="abc_searchview_description_search" msgid="8264924765203268293">"Izlash"</string> + <string name="abc_searchview_description_search" msgid="8264924765203268293">"Qidirish"</string> <string name="abc_search_hint" msgid="7723749260725869598">"Qidirish…"</string> <string name="abc_searchview_description_query" msgid="2550479030709304392">"So‘rovni izlash"</string> <string name="abc_searchview_description_clear" msgid="3691816814315814921">"So‘rovni tozalash"</string> diff --git a/v7/mediarouter/res/values-pt-rBR/strings.xml b/v7/mediarouter/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000000..629c63fe38 --- /dev/null +++ b/v7/mediarouter/res/values-pt-rBR/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2013 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="mr_system_route_name" msgid="5441529851481176817">"Sistema"</string> + <string name="mr_user_route_category_name" msgid="7498112907524977311">"Dispositivos"</string> + <string name="mr_media_route_button_content_description" msgid="8327680881775995150">"Transmitir"</string> + <string name="mr_media_route_chooser_title" msgid="7106830097177242655">"Conectar ao dispositivo"</string> + <string name="mr_media_route_chooser_searching" msgid="7553005460920830010">"Procurando dispositivos…"</string> + <string name="mr_media_route_controller_disconnect" msgid="109793632378378069">"Desconectar"</string> + <string name="mr_media_route_controller_stop" msgid="5398645111664294430">"Interromper transmissão"</string> + <string name="mr_media_route_controller_settings_description" msgid="379358765881274425">"Configurações de rota"</string> + <string name="mr_media_route_controller_play" msgid="5214423499524760404">"Reproduzir"</string> + <string name="mr_media_route_controller_pause" msgid="8315773974194466049">"Pausar"</string> + <string name="mr_media_route_controller_no_info_available" msgid="3641544772007543920">"Nenhuma informação disponível"</string> +</resources> diff --git a/v7/preference/res/layout/preference_category.xml b/v7/preference/res/layout/preference_category.xml index 0b58063131..815425c552 100644 --- a/v7/preference/res/layout/preference_category.xml +++ b/v7/preference/res/layout/preference_category.xml @@ -15,11 +15,9 @@ --> <!-- Layout used for PreferenceCategory in a PreferenceActivity. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content" > - <TextView - style="?android:attr/listSeparatorTextViewStyle" - android:id="@+android:id/title" + android:layout_height="wrap_content" + style="?android:attr/listSeparatorTextViewStyle" + android:id="@android:id/title" /> -</FrameLayout> diff --git a/v7/preference/src/android/support/v7/preference/PreferenceGroupAdapter.java b/v7/preference/src/android/support/v7/preference/PreferenceGroupAdapter.java index 3820cb9f2d..9943087fd1 100644 --- a/v7/preference/src/android/support/v7/preference/PreferenceGroupAdapter.java +++ b/v7/preference/src/android/support/v7/preference/PreferenceGroupAdapter.java @@ -257,7 +257,7 @@ public class PreferenceGroupAdapter extends RecyclerView.Adapter<PreferenceViewH final PreferenceLayout pl = mPreferenceLayouts.get(viewType); final LayoutInflater inflater = LayoutInflater.from(parent.getContext()); - final ViewGroup view = (ViewGroup) inflater.inflate(pl.resId, parent, false); + final View view = inflater.inflate(pl.resId, parent, false); final ViewGroup widgetFrame = (ViewGroup) view.findViewById(android.R.id.widget_frame); if (widgetFrame != null) { diff --git a/v7/recyclerview/src/android/support/v7/widget/LinearLayoutManager.java b/v7/recyclerview/src/android/support/v7/widget/LinearLayoutManager.java index f842ed5572..632b05ce90 100644 --- a/v7/recyclerview/src/android/support/v7/widget/LinearLayoutManager.java +++ b/v7/recyclerview/src/android/support/v7/widget/LinearLayoutManager.java @@ -304,8 +304,7 @@ public class LinearLayoutManager extends RecyclerView.LayoutManager implements /** * Returns the current orientaion of the layout. * - * @return Current orientation. - * @see #mOrientation + * @return Current orientation, either {@link #HORIZONTAL} or {@link #VERTICAL} * @see #setOrientation(int) */ public int getOrientation() { @@ -349,7 +348,7 @@ public class LinearLayoutManager extends RecyclerView.LayoutManager implements * Returns if views are laid out from the opposite direction of the layout. * * @return If layout is reversed or not. - * @see {@link #setReverseLayout(boolean)} + * @see #setReverseLayout(boolean) */ public boolean getReverseLayout() { return mReverseLayout; |