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

Merge "Remove PreferenceCategory wrapper" am: 75124d794c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552

Change-Id: Ia40d77f7daf669323275aab1b05ba81a14c5f499
This commit is contained in:
Bonian Chen
2020-08-10 10:31:58 +00:00
committed by Automerger Merge Worker
parent caf6ede5f7 75124d794c
commit 80b3bb5141
3 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/night_display_activation_button.xml
View File

@@ -15,10 +15,11 @@
limitations under the License.
-->
<FrameLayout
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight">
<Button
android:id="@+id/night_display_turn_on_button"
@@ -26,7 +27,7 @@
android:layout_marginStart="@dimen/screen_margin_sides"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start" />
android:layout_gravity="center_vertical" />
<Button
android:id="@+id/night_display_turn_off_button"
@@ -34,6 +35,6 @@
android:layout_marginStart="@dimen/screen_margin_sides"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start" />
android:layout_gravity="center_vertical" />
</FrameLayout>
</LinearLayout>

21
res/xml/mobile_network_settings_v2.xml
View File

@@ -33,7 +33,7 @@
<com.android.settings.datausage.DataUsageSummaryPreference
android:key="status_header"
android:visibility="gone"
android:selectable="false" />
android:selectable="false"/>
<ListPreference
android:key="calls_preference"
@@ -209,16 +209,15 @@
android:key="erase_sim"
android:persistent="false"
android:title="@string/mobile_network_erase_sim"
settings:controller="com.android.settings.network.telephony.DeleteSimProfilePreferenceController" />
settings:allowDividerBelow="true"
settings:controller="com.android.settings.network.telephony.DeleteSimProfilePreferenceController"/>
<PreferenceCategory
android:key="footer_container"
android:title="@string/summary_placeholder"
android:layout="@layout/preference_category_no_label"
settings:controller="com.android.settings.network.telephony.DisableSimFooterPreferenceController">
<com.android.settingslib.widget.FooterPreference
android:key="disable_sim_explanation"
android:title="@string/mobile_network_disable_sim_explanation" />
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
android:key="disable_sim_explanation"
android:title="@string/mobile_network_disable_sim_explanation"
android:selectable="false"
settings:allowDividerAbove="true"
settings:searchable="false"
settings:controller="com.android.settings.network.telephony.DisableSimFooterPreferenceController"/>
</PreferenceScreen>

13
res/xml/night_display_settings.xml
View File

@@ -49,11 +49,16 @@
android:title="@string/night_display_title"
android:selectable="false"
android:layout="@layout/night_display_activation_button"
settings:allowDividerBelow="true"
settings:keywords="@string/keywords_display_night_display"
settings:controller="com.android.settings.display.NightDisplayActivationPreferenceController" />
<PreferenceCategory android:key="night_display_footer_category">
<com.android.settingslib.widget.FooterPreference />
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
android:key="night_display_footer"
android:title="@string/night_display_text"
android:selectable="false"
settings:allowDividerAbove="true"
settings:searchable="false"
settings:controller="com.android.settings.display.NightDisplayFooterPreferenceController"/>
</PreferenceScreen>
</PreferenceScreen>