Merge "[Provider Model] Add Ethernet network to Internet Panel" into sc-qpr1-dev (01841cf8) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/internet_connectivity_dialog.xml

+54 −83

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@
		android:layout_width="wrap_content"
		android:layout_height="32dp"
		android:textColor="?android:attr/textColorPrimary"
		android:fontFamily="google-sans"
		android:fontFamily="@*android:string/config_headlineFontFamily"
		android:textSize="24sp"/>

		<TextView
		@@ -50,7 +50,7 @@
		android:layout_marginTop="4dp"
		android:ellipsize="end"
		android:maxLines="1"
		android:fontFamily="google-sans"
		android:fontFamily="@*android:string/config_headlineFontFamily"
		android:textSize="14sp"/>
		</LinearLayout>

		@@ -87,24 +87,49 @@
		android:layout_height="wrap_content"
		android:orientation="vertical">
		<LinearLayout
		android:id="@+id/internet_list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<LinearLayout
		android:id="@+id/mobile_network_layout"
		android:layout_width="match_parent"
		android:layout_height="88dp"
		android:clickable="true"
		android:focusable="true"
		android:background="?android:attr/selectableItemBackground"
		android:id="@+id/ethernet_layout"
		style="@style/InternetDialog.Network"
		android:background="@drawable/settingslib_switch_bar_bg_on"
		android:visibility="gone">

		<FrameLayout
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_gravity="center_vertical\|start"
		android:orientation="horizontal"
		android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"
		android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
		android:paddingStart="22dp"
		android:paddingEnd="22dp">
		android:clickable="false">
		<ImageView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:autoMirrored="true"
		android:src="@drawable/stat_sys_ethernet_fully"
		android:tint="@color/connected_network_primary_color"/>
		</FrameLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:gravity="start\|center_vertical"
		android:orientation="vertical"
		android:clickable="false">
		<TextView
		android:text="@string/ethernet_label"
		style="@style/InternetDialog.NetworkTitle.Active"/>
		<TextView
		android:text="@string/to_switch_networks_disconnect_ethernet"
		style="@style/InternetDialog.NetworkSummary.Active"/>
		</LinearLayout>
		</LinearLayout>

		<LinearLayout
		android:id="@+id/mobile_network_layout"
		style="@style/InternetDialog.Network">

		<FrameLayout
		android:layout_width="24dp"
		@@ -121,7 +146,6 @@

		<LinearLayout
		android:layout_weight="1"
		android:id="@+id/mobile_network_list"
		android:orientation="vertical"
		android:clickable="false"
		android:layout_width="wrap_content"
		@@ -129,28 +153,10 @@
		android:gravity="start\|center_vertical">
		<TextView
		android:id="@+id/mobile_title"
		android:textDirection="locale"
		android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
		android:layout_marginEnd="7dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical\|start"
		android:ellipsize="end"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="16sp"
		android:fontFamily="google-sans"/>
		style="@style/InternetDialog.NetworkTitle"/>
		<TextView
		android:id="@+id/mobile_summary"
		android:textDirection="locale"
		android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
		android:layout_marginEnd="34dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical\|start"
		android:ellipsize="end"
		android:textColor="?android:attr/textColorTertiary"
		android:textSize="14sp"
		android:fontFamily="google-sans"/>
		style="@style/InternetDialog.NetworkSummary"/>
		</LinearLayout>

		<FrameLayout
		@@ -172,17 +178,9 @@

		<LinearLayout
		android:id="@+id/turn_on_wifi_layout"
		android:layout_width="match_parent"
		style="@style/InternetDialog.Network"
		android:layout_height="72dp"
		android:clickable="true"
		android:focusable="true"
		android:background="?android:attr/selectableItemBackground"
		android:gravity="center"
		android:orientation="horizontal"
		android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"
		android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
		android:paddingStart="22dp"
		android:paddingEnd="22dp">
		android:gravity="center">

		<FrameLayout
		android:layout_weight="1"
		@@ -193,13 +191,10 @@
		<TextView
		android:id="@+id/wifi_toggle_title"
		android:text="@string/turn_on_wifi"
		android:textDirection="locale"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="start\|center_vertical"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="16sp"
		android:fontFamily="google-sans"/>
		android:textAppearance="@style/TextAppearance.InternetDialog"/>
		</FrameLayout>

		<FrameLayout
		@@ -222,18 +217,12 @@

		<LinearLayout
		android:id="@+id/wifi_connected_layout"
		android:layout_width="match_parent"
		style="@style/InternetDialog.Network"
		android:layout_height="72dp"
		android:layout_gravity="center_vertical\|start"
		android:clickable="true"
		android:focusable="true"
		android:visibility="gone"
		android:background="?android:attr/selectableItemBackground"
		android:orientation="horizontal"
		android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
		android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"
		android:paddingStart="20dp"
		android:paddingEnd="24dp">
		android:paddingEnd="24dp"
		android:background="@drawable/settingslib_switch_bar_bg_on"
		android:visibility="gone">

		<FrameLayout
		android:layout_width="24dp"
		@@ -248,7 +237,6 @@
		</FrameLayout>

		<LinearLayout
		android:id="@+id/wifi_connected_list"
		android:orientation="vertical"
		android:clickable="false"
		android:layout_width="wrap_content"
		@@ -258,26 +246,11 @@
		android:gravity="start\|center_vertical">
		<TextView
		android:id="@+id/wifi_connected_title"
		android:textDirection="locale"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical\|start"
		android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
		android:ellipsize="end"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="14sp"
		android:fontFamily="google-sans"/>
		style="@style/InternetDialog.NetworkTitle.Active"
		android:textSize="14sp"/>
		<TextView
		android:id="@+id/wifi_connected_summary"
		android:textDirection="locale"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical\|start"
		android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
		android:ellipsize="end"
		android:textColor="?android:attr/textColorTertiary"
		android:textSize="14sp"
		android:fontFamily="google-sans"/>
		style="@style/InternetDialog.NetworkSummary.Active"/>
		</LinearLayout>

		<FrameLayout
		@@ -340,13 +313,11 @@
		android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">
		<TextView
		android:text="@string/see_all_networks"
		android:textDirection="locale"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="start\|center_vertical"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="14sp"
		android:fontFamily="google-sans"/>
		android:textAppearance="@style/TextAppearance.InternetDialog"
		android:textSize="14sp"/>
		</FrameLayout>

		</LinearLayout>
		@@ -366,7 +337,7 @@
		android:textColor="?android:attr/textColorPrimary"
		android:text="@string/inline_done_button"
		android:textSize="14sp"
		android:fontFamily="google-sans"/>
		android:fontFamily="@*android:string/config_headlineFontFamily"/>
		</FrameLayout>
		</LinearLayout>
		</androidx.core.widget.NestedScrollView>

packages/SystemUI/res/layout/internet_list_item.xml

+8 −29

Original line number	Diff line number	Diff line
		@@ -24,21 +24,15 @@

		<LinearLayout
		android:id="@+id/wifi_list"
		android:layout_width="match_parent"
		style="@style/InternetDialog.Network"
		android:layout_height="72dp"
		android:layout_gravity="center_vertical\|start"
		android:clickable="true"
		android:focusable="true"
		android:background="?android:attr/selectableItemBackground"
		android:orientation="horizontal"
		android:paddingStart="20dp"
		android:paddingEnd="40dp">
		android:paddingEnd="24dp">
		<FrameLayout
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:clickable="false"
		android:layout_gravity="center_vertical\|start"
		android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">
		android:layout_gravity="center_vertical\|start">
		<ImageView
		android:id="@+id/wifi_icon"
		android:layout_width="wrap_content"
		@@ -52,31 +46,16 @@
		android:clickable="false"
		android:layout_width="wrap_content"
		android:layout_height="72dp"
		android:layout_marginEnd="30dp"
		android:layout_weight="1"
		android:gravity="start\|center_vertical"
		android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">
		android:gravity="start\|center_vertical">
		<TextView
		android:id="@+id/wifi_title"
		android:textDirection="locale"
		android:layout_width="wrap_content"
		android:layout_height="20dp"
		android:gravity="start\|center_vertical"
		android:ellipsize="end"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="14sp"
		android:fontFamily="google-sans"
		android:layout_marginEnd="18dp"/>
		style="@style/InternetDialog.NetworkTitle"
		android:textSize="14sp"/>
		<TextView
		android:id="@+id/wifi_summary"
		android:textDirection="locale"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="start\|center_vertical"
		android:ellipsize="end"
		android:textColor="?android:attr/textColorSecondary"
		android:textSize="14sp"
		android:fontFamily="google-sans"
		android:layout_marginEnd="18dp"/>
		style="@style/InternetDialog.NetworkSummary"/>
		</LinearLayout>

		<FrameLayout

packages/SystemUI/res/values-night/styles.xml

+12 −0

Original line number	Diff line number	Diff line
		@@ -48,4 +48,16 @@
		<item name="android:windowLightStatusBar">false</item>
		</style>

		<style name="TextAppearance.InternetDialog.Active">
		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
		<item name="android:textSize">16sp</item>
		<item name="android:textColor">@color/connected_network_primary_color</item>
		<item name="android:textDirection">locale</item>
		</style>

		<style name="TextAppearance.InternetDialog.Secondary.Active">
		<item name="android:textSize">14sp</item>
		<item name="android:textColor">@color/connected_network_secondary_color</item>
		</style>

		</resources>

packages/SystemUI/res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -3027,4 +3027,6 @@
		<string name="wifi_failed_connect_message">Failed to connect to network</string>
		<!-- Provider Model: Title to see all the networks [CHAR LIMIT=50] -->
		<string name="see_all_networks">See all</string>
		<!-- Summary for warning to disconnect ethernet first then switch to other networks. [CHAR LIMIT=60] -->
		<string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string>
		</resources>

packages/SystemUI/res/values/styles.xml

+56 −0

Original line number	Diff line number	Diff line
		@@ -951,4 +951,60 @@
		<item name="android:maxHeight">4dp</item>
		</style>

		<!-- Internet Dialog -->
		<style name="InternetDialog">
		<item name="android:layout_width">wrap_content</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:layout_gravity">center_vertical\|start</item>
		<item name="android:layout_marginStart">@dimen/internet_dialog_network_layout_margin</item>
		</style>

		<style name="InternetDialog.Network">
		<item name="android:layout_width">match_parent</item>
		<item name="android:layout_height">88dp</item>
		<item name="android:layout_marginEnd">@dimen/internet_dialog_network_layout_margin</item>
		<item name="android:paddingStart">22dp</item>
		<item name="android:paddingEnd">22dp</item>
		<item name="android:orientation">horizontal</item>
		<item name="android:focusable">true</item>
		<item name="android:clickable">true</item>
		</style>

		<style name="InternetDialog.NetworkTitle">
		<item name="android:layout_marginEnd">7dp</item>
		<item name="android:ellipsize">end</item>
		<item name="android:textAppearance">@style/TextAppearance.InternetDialog</item>
		</style>

		<style name="InternetDialog.NetworkTitle.Active">
		<item name="android:textAppearance">@style/TextAppearance.InternetDialog.Active</item>
		</style>

		<style name="InternetDialog.NetworkSummary">
		<item name="android:layout_marginEnd">34dp</item>
		<item name="android:ellipsize">end</item>
		<item name="android:textAppearance">@style/TextAppearance.InternetDialog.Secondary</item>
		</style>

		<style name="InternetDialog.NetworkSummary.Active">
		<item name="android:textAppearance">@style/TextAppearance.InternetDialog.Secondary.Active
		</item>
		</style>

		<style name="TextAppearance.InternetDialog">
		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
		<item name="android:textSize">16sp</item>
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		<item name="android:textDirection">locale</item>
		</style>

		<style name="TextAppearance.InternetDialog.Secondary">
		<item name="android:textSize">14sp</item>
		<item name="android:textColor">?android:attr/textColorTertiary</item>
		</style>

		<style name="TextAppearance.InternetDialog.Active"/>

		<style name="TextAppearance.InternetDialog.Secondary.Active"/>

		</resources>