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

Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 955ff8831c

Browse Source 
Change-Id: I27e9dcac6ea6c8d5927769db26c87f060cc7ebfb
This commit is contained in:
Arc Wang
2020-05-05 01:33:07 +00:00
committed by Automerger Merge Worker
parent 1652d1c455 955ff8831c
commit 7acc3f411d
5 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
res/layout/network_request_dialog_title.xml
View File

@@ -18,28 +18,43 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingEnd="?android:attr/dialogPreferredPadding"
android:orientation="horizontal"
android:orientation="vertical"
android:background="?android:attr/selectableItemBackground"
android:minHeight="?android:attr/listPreferredItemHeightSmall">
<TextView
android:id="@+id/network_request_title_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingLeft="24dp"
android:paddingTop="18dp"
android:layout_weight="1"
android:textSize="18sp"
android:gravity="center_vertical"
style="@style/info_label"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="24dp">
<ProgressBar
android:id="@+id/network_request_title_progress"
style="?android:attr/progressBarStyleSmallTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dip"
android:minWidth="32dp"
android:text="@string/progress_scanning"/>
<TextView
android:id="@+id/network_request_title_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingTop="18dp"
android:layout_weight="1"
android:textSize="20sp"
android:gravity="center_vertical"
style="@style/info_label"/>
<ProgressBar
android:id="@+id/network_request_title_progress"
style="?android:attr/progressBarStyleSmallTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="20dp"
android:gravity="center_vertical"
android:layout_marginStart="16dip"
android:minWidth="32dp"
android:text="@string/progress_scanning"/>
</LinearLayout>
<TextView
android:id="@+id/network_request_summary_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="24dp"
android:paddingTop="18dp"
android:textSize="16sp"/>
</LinearLayout>

7
res/values/strings.xml
View File

@@ -11742,7 +11742,12 @@
<string name="see_less">See less</string>
<!-- Title for Network connection request Dialog [CHAR LIMIT=60] -->
<string name="network_connection_request_dialog_title">Device to use with <xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g></string>
<string name="network_connection_request_dialog_title">Connect to device</string>
<!-- Summary for Network connection request Dialog [CHAR LIMIT=NONE] -->
<string name="network_connection_request_dialog_summary">
<xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g>
app wants to use a temporary Wi\u2011Fi network to connect to your device
</string>
<!-- Message for Network connection timeout Dialog [CHAR LIMIT=NONE] -->
<string name="network_connection_timeout_dialog_message">No devices found. Make sure devices are turned on and available to connect.</string>
<!-- OK button for Network connection timeout Dialog [CHAR LIMIT=30] -->