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

Merge "[Provider Model] Update Airplane mode message" into sc-dev

Browse Source
This commit is contained in:
Weng Su
2021-03-12 07:04:52 +00:00
committed by Android (Google) Code Review
parent 14a2fd6bc1 8ce423cdd2
commit d0e98010c4
7 changed files with 65 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/layout/view_airplane_mode_networks_button.xml → res/layout/airplane_mode_message_preference.xml
View File

@@ -22,7 +22,6 @@
android:orientation="vertical">
<TextView
android:id="@+id/airplane_mode_text"
android:text="@string/condition_airplane_title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
@@ -30,17 +29,6 @@
android:layout_gravity="center_horizontal"
android:layout_marginStart="@dimen/content_margin_left"
android:layout_marginEnd="@dimen/content_margin_left"
android:layout_marginTop="@dimen/view_airplane_mode_networks_button_margin_vertical"
android:layout_marginBottom="@dimen/view_airplane_mode_networks_button_margin_vertical"/>
<Button
android:id="@+id/view_airplane_mode_networks_button"
android:text="@string/view_airplane_safe_networks"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginStart="@dimen/content_margin_left"
android:layout_marginEnd="@dimen/content_margin_left"
android:layout_marginBottom="@dimen/view_airplane_mode_networks_button_margin_vertical"
style="@style/ActionPrimaryButton"/>
android:layout_marginTop="@dimen/airplane_mode_message_margin_vertical"
android:layout_marginBottom="@dimen/airplane_mode_message_margin_vertical"/>
</LinearLayout>

2
res/values/dimens.xml
View File

@@ -213,7 +213,7 @@
<dimen name="wifi_detail_page_header_image_size">32dp</dimen>
<!-- Internet Preferences -->
<dimen name="view_airplane_mode_networks_button_margin_vertical">24dp</dimen>
<dimen name="airplane_mode_message_margin_vertical">24dp</dimen>
<dimen name="reset_internet_ring_progress_right_margin">4dp</dimen>
<!-- Color picker -->

6
res/xml/network_provider_settings.xml
View File

@@ -28,12 +28,12 @@
android:layout="@layout/resetting_internet"
settings:allowDividerBelow="true"/>
<!-- View airplane mode networks button -->
<!-- Airplane mode message -->
<com.android.settingslib.widget.LayoutPreference
android:key="view_airplane_mode_netwokrs_button"
android:key="airplane_mode_message"
android:title="@string/condition_airplane_title"
android:selectable="false"
android:layout="@layout/view_airplane_mode_networks_button"
android:layout="@layout/airplane_mode_message_preference"
settings:allowDividerBelow="true"/>
<Preference