diff options
| author | Alan Viverette <alanv@google.com> | 2014-03-11 02:15:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 02:15:27 +0000 |
| commit | a74da813ec622822c8bb8b4524439c81e8b90dfa (patch) | |
| tree | 6c04313e38e2afa737c40c9bdea610055ea49472 /res | |
| parent | a8e634ca5367dde80873a0b7643e27284db56336 (diff) | |
| parent | d43d5becb359cfdd5e30f691724739ab216011f0 (diff) | |
| download | packages_apps_Settings-a74da813ec622822c8bb8b4524439c81e8b90dfa.zip packages_apps_Settings-a74da813ec622822c8bb8b4524439c81e8b90dfa.tar.gz packages_apps_Settings-a74da813ec622822c8bb8b4524439c81e8b90dfa.tar.bz2 | |
am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit 'd43d5becb359cfdd5e30f691724739ab216011f0':
DO NOT MERGE Remove extra fragment in captioning preferences
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/captioning_preview.xml | 3 | ||||
| -rw-r--r-- | res/xml/accessibility_settings.xml | 2 | ||||
| -rw-r--r-- | res/xml/captioning_settings.xml | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/res/layout/captioning_preview.xml b/res/layout/captioning_preview.xml index 00d94a0..44563e4 100644 --- a/res/layout/captioning_preview.xml +++ b/res/layout/captioning_preview.xml @@ -40,9 +40,8 @@ android:text="@string/captioning_preview_text" /> </FrameLayout> - <fragment + <FrameLayout android:id="@+id/properties_fragment" - android:name="com.android.settings.accessibility.CaptionPropertiesFragment" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 7b599b8..ee49bbd 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -28,7 +28,7 @@ android:title="@string/accessibility_system_title"> <PreferenceScreen - android:fragment="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment" + android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment" android:key="captioning_preference_screen" android:title="@string/accessibility_captioning_title" /> diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml index 9773943..02fe51f 100644 --- a/res/xml/captioning_settings.xml +++ b/res/xml/captioning_settings.xml @@ -17,7 +17,7 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" - android:fragment="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment" + android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment" android:key="captioning_preference_screen" android:title="@string/accessibility_captioning_title" > |