Merge "Base implementation of WFC disclaimer UI" (c776acee) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+12 −0

Original line number	Diff line number	Diff line
		@@ -3124,6 +3124,18 @@

		<activity android:name=".homepage.contextualcards.ContextualCardFeedbackDialog"
		android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />

		<activity
		android:name="Settings$WifiCallingDisclaimerActivity"
		android:label="@string/wifi_calling_settings_title"
		android:taskAffinity="com.android.settings">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.wifi.calling.WifiCallingDisclaimerFragment" />
		</activity>
		<!-- This is the longest AndroidManifest.xml ever. -->
		</application>
		</manifest>

res/layout/wfc_disclaimer_fragment.xml

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<TextView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="16dp"
		android:layout_marginStart="16dp"
		android:layout_marginBottom="20dp"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:text="@string/wfc_disclaimer_title_text" />

		<View
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:background="?android:attr/listDivider" />

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/disclaimer_item_list"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1" />

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

		<Button
		android:id="@+id/disagree_button"
		style="@style/DisclaimerNegativeButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:text="@string/wfc_disclaimer_disagree_text" />

		<Space
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1" />

		<Button
		android:id="@+id/agree_button"
		style="@style/DisclaimerPositiveButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:text="@string/wfc_disclaimer_agree_button_text" />
		</LinearLayout>
		</LinearLayout>

res/layout/wfc_simple_disclaimer_item.xml

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingTop="16dp"
		android:paddingBottom="20dp"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:gravity="center_vertical">
		<TextView
		android:id="@+id/disclaimer_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead" />
		<TextView
		android:id="@+id/disclaimer_desc"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary"
		android:layout_below="@id/disclaimer_title" />
		</RelativeLayout>
		No newline at end of file

res/values/strings.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -10783,6 +10783,15 @@
		<!-- Summary for represent which device is playing media [CHAR LIMIT=NONE] -->
		<string name="media_output_panel_summary_of_playing_device">Currently playing on <xliff:g id="device_name" example="Bose headphone">%1$s</xliff:g></string>

		<!-- Label for the title on wfc disclaimer fragment. [CHAR LIMIT=40] -->
		<string name="wfc_disclaimer_title_text">Important information</string>

		<!-- Label for the agree button on wfc disclaimer fragment. [CHAR LIMIT=30] -->
		<string name="wfc_disclaimer_agree_button_text">CONTINUE</string>

		<!-- Label for the disagree button on wfc disclaimer fragment. [CHAR LIMIT=30] -->
		<string name="wfc_disclaimer_disagree_text">NO THANKS</string>

		<!-- Message for forget passpoint dialog [CHAR LIMIT=none] -->
		<string name="forget_passpoint_dialog_message">You may lose access to any remaining time or data. Check with your provider before removing.</string>

res/values/styles.xml

+13 −0

Original line number	Diff line number	Diff line
		@@ -520,4 +520,17 @@
		<!-- Padding between content and the start icon is 8dp. -->
		<item name="contentStartPadding">8dp</item>
		</style>

		<style name="DisclaimerPositiveButton" parent="@style/SudGlifButton.Primary">
		<item name="android:layout_margin">16dp</item>
		<item name="android:paddingStart">8dp</item>
		<item name="android:paddingEnd">8dp</item>
		</style>

		<style name="DisclaimerNegativeButton" parent="@style/SudGlifButton.Secondary">
		<item name="android:layout_margin">16dp</item>
		<item name="android:paddingStart">8dp</item>
		<item name="android:paddingEnd">8dp</item>
		</style>

		</resources>