Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-qpr1-dev am: 78569f942a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15648933

Change-Id: Id13225c705ad4c9fb602dc2535b46ae18200c601
This commit is contained in:
Zoey Chen
2021-08-25 13:49:38 +00:00
committed by Automerger Merge Worker
parent 55999ce8ad 78569f942a
commit 2d13812cab
6 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
packages/SystemUI/res/layout/internet_connectivity_dialog.xml
View File

@@ -30,7 +30,7 @@
style="@style/Widget.SliceView.Panel" style="@style/Widget.SliceView.Panel"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="@dimen/internet_dialog_network_layout_margin"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@@ -57,7 +57,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:layout_marginBottom="@dimen/internet_dialog_network_layout_margin"
android:orientation="vertical"> android:orientation="vertical">
<View <View
@@ -101,8 +101,8 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginEnd="@dimen/settingslib_switchbar_margin" android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"
android:layout_marginStart="@dimen/settingslib_switchbar_margin" android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:paddingStart="22dp" android:paddingStart="22dp"
android:paddingEnd="22dp"> android:paddingEnd="22dp">
@@ -130,24 +130,24 @@
<TextView <TextView
android:id="@+id/mobile_title" android:id="@+id/mobile_title"
android:textDirection="locale" android:textDirection="locale"
android:layout_marginStart="16dp" android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:layout_marginEnd="7dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp" android:textSize="16sp"
android:fontFamily="google-sans"/> android:fontFamily="google-sans"/>
<TextView <TextView
android:id="@+id/mobile_summary" android:id="@+id/mobile_summary"
android:textDirection="locale" android:textDirection="locale"
android:layout_marginStart="16dp" android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:layout_marginEnd="34dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:attr/textColorTertiary" android:textColor="?android:attr/textColorTertiary"
android:textSize="14sp" android:textSize="14sp"
android:fontFamily="google-sans"/> android:fontFamily="google-sans"/>
@@ -179,8 +179,8 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginEnd="@dimen/settingslib_switchbar_margin" android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"
android:layout_marginStart="@dimen/settingslib_switchbar_margin" android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:paddingStart="22dp" android:paddingStart="22dp"
android:paddingEnd="22dp"> android:paddingEnd="22dp">
@@ -230,10 +230,10 @@
android:visibility="gone" android:visibility="gone"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginEnd="@dimen/settingslib_switchbar_margin" android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:layout_marginStart="@dimen/settingslib_switchbar_margin" android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin"
android:paddingStart="22dp" android:paddingStart="20dp"
android:paddingEnd="22dp"> android:paddingEnd="24dp">
<FrameLayout <FrameLayout
android:layout_width="24dp" android:layout_width="24dp"
@@ -248,12 +248,13 @@
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout
android:layout_weight="3"
android:id="@+id/wifi_connected_list" android:id="@+id/wifi_connected_list"
android:orientation="vertical" android:orientation="vertical"
android:clickable="false" android:clickable="false"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_marginEnd="30dp"
android:layout_weight="1"
android:gravity="start|center_vertical"> android:gravity="start|center_vertical">
<TextView <TextView
android:id="@+id/wifi_connected_title" android:id="@+id/wifi_connected_title"
@@ -261,9 +262,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:layout_marginStart="16dp" android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="14sp" android:textSize="14sp"
android:fontFamily="google-sans"/> android:fontFamily="google-sans"/>
@@ -273,9 +273,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:layout_marginStart="16dp" android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:attr/textColorTertiary" android:textColor="?android:attr/textColorTertiary"
android:textSize="14sp" android:textSize="14sp"
android:fontFamily="google-sans"/> android:fontFamily="google-sans"/>
@@ -284,14 +283,14 @@
<FrameLayout <FrameLayout
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="5dp"
android:clickable="false" android:clickable="false"
android:layout_gravity="end|center_vertical"
android:gravity="center"> android:gravity="center">
<ImageView <ImageView
android:id="@+id/wifi_settings_icon" android:id="@+id/wifi_settings_icon"
android:src="@drawable/ic_settings_24dp" android:src="@drawable/ic_settings_24dp"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_gravity="center" android:layout_gravity="end|center_vertical"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</FrameLayout> </FrameLayout>
@@ -324,7 +323,7 @@
android:layout_height="24dp" android:layout_height="24dp"
android:clickable="false" android:clickable="false"
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:layout_marginStart="16dp"> android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">
<ImageView <ImageView
android:id="@+id/arrow_forward" android:id="@+id/arrow_forward"
android:src="@drawable/ic_arrow_forward" android:src="@drawable/ic_arrow_forward"
@@ -338,7 +337,7 @@
android:clickable="false" android:clickable="false"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="16dp"> android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">
<TextView <TextView
android:text="@string/see_all_networks" android:text="@string/see_all_networks"
android:textDirection="locale" android:textDirection="locale"

36
packages/SystemUI/res/layout/internet_list_item.xml
View File

@@ -31,15 +31,14 @@
android:focusable="true" android:focusable="true"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="22dp" android:paddingStart="20dp"
android:paddingEnd="22dp"> android:paddingEnd="40dp">
<FrameLayout <FrameLayout
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:clickable="false" android:clickable="false"
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:layout_marginStart="16dp"> android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">
<ImageView <ImageView
android:id="@+id/wifi_icon" android:id="@+id/wifi_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -48,52 +47,47 @@
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout
android:layout_weight="3"
android:id="@+id/wifi_network_layout" android:id="@+id/wifi_network_layout"
android:orientation="vertical" android:orientation="vertical"
android:clickable="false" android:clickable="false"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="72dp"> android:layout_height="72dp"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:layout_marginStart="@dimen/internet_dialog_network_layout_margin">
<TextView <TextView
android:id="@+id/wifi_title" android:id="@+id/wifi_title"
android:textDirection="locale" android:textDirection="locale"
android:layout_weight="1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="20dp"
android:layout_gravity="center_vertical|start"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:layout_marginStart="16dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="14sp" android:textSize="14sp"
android:fontFamily="google-sans"/> android:fontFamily="google-sans"
android:layout_marginEnd="18dp"/>
<TextView <TextView
android:id="@+id/wifi_summary" android:id="@+id/wifi_summary"
android:textDirection="locale" android:textDirection="locale"
android:layout_weight="1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="20dp"
android:layout_gravity="center_vertical|start"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:layout_marginStart="16dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="14sp" android:textSize="14sp"
android:fontFamily="google-sans"/> android:fontFamily="google-sans"
android:layout_marginEnd="18dp"/>
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="@dimen/settingslib_switchbar_padding_right"
android:clickable="false" android:clickable="false"
android:gravity="center"> android:layout_gravity="end|center_vertical">
<ImageView <ImageView
android:id="@+id/wifi_locked_icon" android:id="@+id/wifi_locked_icon"
android:layout_gravity="end|center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</FrameLayout> </FrameLayout>

3
packages/SystemUI/res/values-sw600dp/dimens.xml
View File

@@ -95,4 +95,7 @@
<dimen name="controls_top_margin">24dp</dimen> <dimen name="controls_top_margin">24dp</dimen>
<dimen name="global_actions_grid_item_layout_height">80dp</dimen> <dimen name="global_actions_grid_item_layout_height">80dp</dimen>
<!-- Internet panel related dimensions -->
<dimen name="internet_dialog_list_max_width">624dp</dimen>
</resources> </resources>

7
packages/SystemUI/res/values/dimens.xml
View File

@@ -1594,15 +1594,16 @@
<!-- Internet panel related dimensions --> <!-- Internet panel related dimensions -->
<dimen name="internet_dialog_list_margin">12dp</dimen> <dimen name="internet_dialog_list_margin">12dp</dimen>
<dimen name="internet_dialog_list_max_height">646dp</dimen> <dimen name="internet_dialog_list_max_height">646dp</dimen>
<dimen name="internet_dialog_list_max_width">412dp</dimen> <dimen name="internet_dialog_list_max_width">@dimen/match_parent</dimen>
<!-- Signal icon in internet dialog --> <!-- Signal icon in internet dialog -->
<dimen name="signal_strength_icon_size">24dp</dimen> <dimen name="signal_strength_icon_size">24dp</dimen>
<!-- Internet dialog related dimensions --> <!-- Internet dialog related dimensions -->
<dimen name="internet_dialog_corner_radius">24dp</dimen> <dimen name="internet_dialog_corner_radius">24dp</dimen>
<!-- End margin of network layout -->
<!-- Size of internet dialog --> <dimen name="internet_dialog_network_layout_margin">16dp</dimen>
<!-- Size of switch bar in internet dialog -->
<dimen name="settingslib_switchbar_margin">16dp</dimen> <dimen name="settingslib_switchbar_margin">16dp</dimen>
<!-- Minimum width of switch --> <!-- Minimum width of switch -->
<dimen name="settingslib_min_switch_width">52dp</dimen> <dimen name="settingslib_min_switch_width">52dp</dimen>

3
packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java
View File

@@ -175,12 +175,9 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern
mWifiNetworkLayout.setVisibility(View.VISIBLE); mWifiNetworkLayout.setVisibility(View.VISIBLE);
mWifiTitleText.setText(title); mWifiTitleText.setText(title);
if (TextUtils.isEmpty(summary)) { if (TextUtils.isEmpty(summary)) {
mWifiTitleText.setGravity(Gravity.CENTER);
mWifiSummaryText.setVisibility(View.GONE); mWifiSummaryText.setVisibility(View.GONE);
return; return;
} else { } else {
mWifiTitleText.setGravity(Gravity.BOTTOM);
mWifiSummaryText.setGravity(Gravity.TOP);
mWifiSummaryText.setVisibility(View.VISIBLE); mWifiSummaryText.setVisibility(View.VISIBLE);
} }
mWifiSummaryText.setText(summary); mWifiSummaryText.setText(summary);

18
packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java
View File

@@ -104,6 +104,7 @@ public class InternetDialog extends SystemUIDialog implements
private TextView mInternetDialogSubTitle; private TextView mInternetDialogSubTitle;
private View mDivider; private View mDivider;
private ProgressBar mProgressBar; private ProgressBar mProgressBar;
private LinearLayout mInternetDialogLayout;
private LinearLayout mInternetListLayout; private LinearLayout mInternetListLayout;
private LinearLayout mConnectedWifListLayout; private LinearLayout mConnectedWifListLayout;
private LinearLayout mConnectedWifList; private LinearLayout mConnectedWifList;
@@ -125,7 +126,7 @@ public class InternetDialog extends SystemUIDialog implements
private Button mDoneButton; private Button mDoneButton;
private Drawable mBackgroundOn; private Drawable mBackgroundOn;
private int mListMaxHeight; private int mListMaxHeight;
private int mListMaxWidth; private int mLayoutWidth;
private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private boolean mCanConfigMobileData; private boolean mCanConfigMobileData;
@@ -146,10 +147,10 @@ public class InternetDialog extends SystemUIDialog implements
private final ViewTreeObserver.OnGlobalLayoutListener mInternetListLayoutListener = () -> { private final ViewTreeObserver.OnGlobalLayoutListener mInternetListLayoutListener = () -> {
// Set max height for list // Set max height for list
if (mInternetListLayout.getHeight() > mListMaxHeight) { if (mInternetDialogLayout.getHeight() > mListMaxHeight) {
ViewGroup.LayoutParams params = mInternetListLayout.getLayoutParams(); ViewGroup.LayoutParams params = mInternetDialogLayout.getLayoutParams();
params.height = mListMaxHeight; params.height = mListMaxHeight;
mInternetListLayout.setLayoutParams(params); mInternetDialogLayout.setLayoutParams(params);
} }
}; };
@@ -180,7 +181,7 @@ public class InternetDialog extends SystemUIDialog implements
}; };
mListMaxHeight = context.getResources().getDimensionPixelSize( mListMaxHeight = context.getResources().getDimensionPixelSize(
R.dimen.internet_dialog_list_max_height); R.dimen.internet_dialog_list_max_height);
mListMaxWidth = context.getResources().getDimensionPixelSize( mLayoutWidth = context.getResources().getDimensionPixelSize(
R.dimen.internet_dialog_list_max_width); R.dimen.internet_dialog_list_max_width);
mUiEventLogger = uiEventLogger; mUiEventLogger = uiEventLogger;
mAdapter = new InternetAdapter(mInternetDialogController); mAdapter = new InternetAdapter(mInternetDialogController);
@@ -208,11 +209,14 @@ public class InternetDialog extends SystemUIDialog implements
layoutParams.setFitInsetsIgnoringVisibility(true); layoutParams.setFitInsetsIgnoringVisibility(true);
window.setAttributes(layoutParams); window.setAttributes(layoutParams);
window.setContentView(mDialogView); window.setContentView(mDialogView);
window.setLayout(mListMaxWidth, ViewGroup.LayoutParams.WRAP_CONTENT); //Only fix the width for large screen or tablet.
window.setLayout(mContext.getResources().getDimensionPixelSize(
R.dimen.internet_dialog_list_max_width), ViewGroup.LayoutParams.WRAP_CONTENT);
window.setWindowAnimations(R.style.Animation_InternetDialog); window.setWindowAnimations(R.style.Animation_InternetDialog);
window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
window.addFlags(FLAG_LAYOUT_NO_LIMITS); window.addFlags(FLAG_LAYOUT_NO_LIMITS);
mInternetDialogLayout = mDialogView.requireViewById(R.id.internet_connectivity_dialog);
mInternetDialogTitle = mDialogView.requireViewById(R.id.internet_dialog_title); mInternetDialogTitle = mDialogView.requireViewById(R.id.internet_dialog_title);
mInternetDialogSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle); mInternetDialogSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle);
mDivider = mDialogView.requireViewById(R.id.divider); mDivider = mDialogView.requireViewById(R.id.divider);
@@ -237,7 +241,7 @@ public class InternetDialog extends SystemUIDialog implements
mMobileDataToggle = mDialogView.requireViewById(R.id.mobile_toggle); mMobileDataToggle = mDialogView.requireViewById(R.id.mobile_toggle);
mWiFiToggle = mDialogView.requireViewById(R.id.wifi_toggle); mWiFiToggle = mDialogView.requireViewById(R.id.wifi_toggle);
mBackgroundOn = mContext.getDrawable(R.drawable.settingslib_switch_bar_bg_on); mBackgroundOn = mContext.getDrawable(R.drawable.settingslib_switch_bar_bg_on);
mInternetListLayout.getViewTreeObserver().addOnGlobalLayoutListener( mInternetDialogLayout.getViewTreeObserver().addOnGlobalLayoutListener(
mInternetListLayoutListener); mInternetListLayoutListener);
mInternetDialogTitle.setText(getDialogTitleText()); mInternetDialogTitle.setText(getDialogTitleText());
mInternetDialogTitle.setGravity(Gravity.START | Gravity.CENTER_VERTICAL); mInternetDialogTitle.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);