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

Merge "Set background for ripple feedback on network items" into sc-v2-dev am: 820b49488d

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

Change-Id: Id0aaeac81fbd633321808eee42aadb39d5446b59
This commit is contained in:
TreeHugger Robot
2021-11-02 15:29:29 +00:00
committed by Automerger Merge Worker
parent 39e6b0e8d7 820b49488d
commit 69dc7a4f21
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,7 +329,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:clickable="false" android:clickable="false"
android:focusable="false"> android:focusable="false"
android:visibility="gone">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"

3
packages/SystemUI/res/values/styles.xml
View File

@@ -983,12 +983,15 @@
<style name="InternetDialog.Network"> <style name="InternetDialog.Network">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">88dp</item> <item name="android:layout_height">88dp</item>
<item name="android:layout_marginStart">@dimen/internet_dialog_network_layout_margin</item>
<item name="android:layout_marginEnd">@dimen/internet_dialog_network_layout_margin</item> <item name="android:layout_marginEnd">@dimen/internet_dialog_network_layout_margin</item>
<item name="android:layout_gravity">center_vertical|start</item>
<item name="android:paddingStart">22dp</item> <item name="android:paddingStart">22dp</item>
<item name="android:paddingEnd">22dp</item> <item name="android:paddingEnd">22dp</item>
<item name="android:orientation">horizontal</item> <item name="android:orientation">horizontal</item>
<item name="android:focusable">true</item> <item name="android:focusable">true</item>
<item name="android:clickable">true</item> <item name="android:clickable">true</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
</style> </style>
<style name="InternetDialog.NetworkTitle"> <style name="InternetDialog.NetworkTitle">

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

@@ -19,6 +19,7 @@ import static com.android.systemui.Prefs.Key.QS_HAS_TURNED_OFF_MOBILE_DATA;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
@@ -122,6 +123,7 @@ public class InternetDialog extends SystemUIDialog implements
private Switch mWiFiToggle; private Switch mWiFiToggle;
private FrameLayout mDoneLayout; private FrameLayout mDoneLayout;
private Drawable mBackgroundOn; private Drawable mBackgroundOn;
private Drawable mBackgroundOff = null;
private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; private int mDefaultDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private boolean mCanConfigMobileData; private boolean mCanConfigMobileData;
@@ -209,6 +211,14 @@ public class InternetDialog extends SystemUIDialog implements
mInternetDialogTitle.setText(getDialogTitleText()); mInternetDialogTitle.setText(getDialogTitleText());
mInternetDialogTitle.setGravity(Gravity.START | Gravity.CENTER_VERTICAL); mInternetDialogTitle.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
TypedArray typedArray = mContext.obtainStyledAttributes(
new int[]{android.R.attr.selectableItemBackground});
try {
mBackgroundOff = typedArray.getDrawable(0 /* index */);
} finally {
typedArray.recycle();
}
setOnClickListener(); setOnClickListener();
mTurnWifiOnLayout.setBackground(null); mTurnWifiOnLayout.setBackground(null);
mWifiRecyclerView.setLayoutManager(new LinearLayoutManager(mContext)); mWifiRecyclerView.setLayoutManager(new LinearLayoutManager(mContext));
@@ -364,7 +374,8 @@ public class InternetDialog extends SystemUIDialog implements
mMobileSummaryText.setTextAppearance(isCarrierNetworkConnected mMobileSummaryText.setTextAppearance(isCarrierNetworkConnected
? R.style.TextAppearance_InternetDialog_Secondary_Active ? R.style.TextAppearance_InternetDialog_Secondary_Active
: R.style.TextAppearance_InternetDialog_Secondary); : R.style.TextAppearance_InternetDialog_Secondary);
mMobileNetworkLayout.setBackground(isCarrierNetworkConnected ? mBackgroundOn : null); mMobileNetworkLayout.setBackground(
isCarrierNetworkConnected ? mBackgroundOn : mBackgroundOff);
mMobileDataToggle.setVisibility(mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE); mMobileDataToggle.setVisibility(mCanConfigMobileData ? View.VISIBLE : View.INVISIBLE);
} }