Merge "Convert more pages to use ActionButtonPreference"
This commit is contained in:
committed by
Android (Google) Code Review
commit
c7e7f28e88
@@ -23,10 +23,8 @@
|
||||
android:layout="@layout/settings_entity_header"
|
||||
android:selectable="false"/>
|
||||
|
||||
<com.android.settings.applications.LayoutPreference
|
||||
android:key="action_buttons"
|
||||
android:layout="@layout/app_action_buttons"
|
||||
android:selectable="false"/>
|
||||
<com.android.settings.widget.ActionButtonPreference
|
||||
android:key="action_buttons" />
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="bluetooth_profiles"/>
|
||||
|
@@ -31,11 +31,9 @@
|
||||
android:selectable="false"
|
||||
android:order="-9999"/>
|
||||
|
||||
<com.android.settings.applications.LayoutPreference
|
||||
android:key="action_buttons"
|
||||
android:layout="@layout/app_action_buttons"
|
||||
android:selectable="false"
|
||||
android:order="-9998"/>
|
||||
<com.android.settings.widget.ActionButtonPreference
|
||||
android:key="action_buttons"
|
||||
android:order="-9998" />
|
||||
|
||||
<Preference
|
||||
android:key="notification_settings"
|
||||
|
@@ -51,10 +51,8 @@
|
||||
android:defaultValue="100"
|
||||
android:max="400"/>
|
||||
|
||||
<com.android.settings.applications.LayoutPreference
|
||||
android:key="action_buttons"
|
||||
android:layout="@layout/tts_action_buttons"
|
||||
android:selectable="false"/>
|
||||
<com.android.settings.widget.ActionButtonPreference
|
||||
android:key="action_buttons" />
|
||||
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
|
Reference in New Issue
Block a user