Snap for 4787078 from 0cf2e41bf8e5f179b7f63e213095b36847378705 to pi-release (b32a1850) · Commits · e / os / android_packages_apps_Settings

res/layout/choose_lock_pattern_common.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		<TextView
		android:id="@+id/suw_layout_title"
		style="@style/SuwGlifHeaderTitle"
		android:accessibilityLiveRegion="polite"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

res/layout/radio_info.xml

+24 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,30 @@
		<TextView android:id="@+id/roaming" style="@style/info_value" />
		</LinearLayout>

		<!-- Link Bandwidth -->
		<LinearLayout style="@style/entry_layout" android:orientation="horizontal">
		<TextView android:text="@string/radio_info_dl_kbps" style="@style/info_label" />
		<TextView android:id="@+id/dl_kbps" style="@style/info_value" />
		</LinearLayout>

		<!-- Link Bandwidth -->
		<LinearLayout style="@style/entry_layout" android:orientation="horizontal">
		<TextView android:text="@string/radio_info_ul_kbps" style="@style/info_label" />
		<TextView android:id="@+id/ul_kbps" style="@style/info_value" />
		</LinearLayout>

		<!-- Physical Channel Config -->
		<LinearLayout style="@style/entry_layout">
		<TextView android:text="@string/radio_info_phy_chan_config" style="@style/info_label" />
		<TextView android:id="@+id/phy_chan_config" style="@style/info_value" />
		</LinearLayout>

		<!-- Horizontal Rule -->
		<View
		android:layout_width="fill_parent"
		android:layout_height="1dip"
		android:background="#000000" />

		<!-- Preferred Network Type -->
		<TextView
		android:layout_width="match_parent"

res/layout/storage_item.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@
		android:layout_height="wrap_content"
		android:textAlignment="viewStart"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondaryNoDisable"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="10"
		android:layout_alignParentEnd="true"/>

res/layout/zen_onboarding.xml

+93 −21

Original line number	Diff line number	Diff line
		@@ -17,8 +17,15 @@
		<RelativeLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="320dp"
		android:layout_height="wrap_content" >

		<RelativeLayout
		android:id="@+id/zen_onboarding_choices"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="20dp">
		android:paddingLeft="24dp"
		android:paddingRight="24dp"
		android:paddingTop="18dp">

		<TextView
		android:id="@+id/header"
		@@ -27,30 +34,95 @@
		android:text="@string/zen_onboarding_dnd_visual_disturbances_header"
		android:textAppearance="@android:style/TextAppearance.Material.DialogWindowTitle" />

		<LinearLayout
		android:id="@+id/zen_onboarding_new_setting"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@+id/header"
		android:layout_centerHorizontal="true"
		android:layout_marginTop="22dp"
		android:orientation="horizontal">

		<RadioButton
		android:id="@+id/zen_onboarding_new_setting_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingHorizontal="8dp" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<TextView
		android:id="@+id/feature_description"
		android:id="@+id/zen_onboarding_new_setting_title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/zen_onboarding_new_setting_title"
		android:textAppearance="?android:attr/textAppearanceListItem" />

		<TextView
		android:id="@+id/zen_onboarding_new_setting_summary"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/zen_onboarding_new_setting_summary" />
		</LinearLayout>

		</LinearLayout>

		<LinearLayout
		android:id="@+id/zen_onboarding_current_setting"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@+id/zen_onboarding_new_setting"
		android:layout_centerHorizontal="true"
		android:layout_marginTop="10dp"
		android:orientation="horizontal">

		<RadioButton
		android:id="@+id/zen_onboarding_current_setting_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@+id/header"
		android:layout_marginTop="24dp"
		android:textAppearance="?android:attr/textAppearanceListItem"
		android:text="@string/zen_onboarding_dnd_visual_disturbances_description" />
		android:paddingHorizontal="8dp" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<TextView
		android:id="@+id/zen_onboarding_current_setting_title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/zen_onboarding_current_setting_title"
		android:textAppearance="?android:attr/textAppearanceListItem" />

		<TextView
		android:id="@+id/zen_onboarding_current_setting_summary"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/zen_onboarding_current_setting_summary" />
		</LinearLayout>
		</LinearLayout>
		</RelativeLayout>

		<RelativeLayout
		android:id="@+id/buttons"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@+id/feature_description"
		android:layout_marginTop="35dp">
		android:layout_below="@+id/zen_onboarding_choices"
		android:layout_marginLeft="8dp"
		android:layout_marginTop="20dp"
		android:layout_marginBottom="10dp">

		<Button
		android:id="@+id/no"
		android:id="@+id/settings"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/zen_onboarding_no_update"
		android:layout_toStartOf="@+id/ok"
		android:text="@string/zen_onboarding_settings"
		android:layout_alignParentStart="true"
		style="@style/TextAppearance.ZenOnboardingButton"
		android:onClick="close" />
		android:onClick="launchSettings" />

		<Button
		android:id="@+id/ok"

res/values/config.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -131,7 +131,4 @@
		<!-- List of a11y components on the device allowed to be enabled by Settings Slices -->
		<string-array name="config_settings_slices_accessibility_components" translatable="false"/>

		<!-- Whether or not swipe up gesture's opt-in setting is available on this device -->
		<bool name="config_swipe_up_gesture_setting_available">false</bool>

		</resources>