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

Merge "Up contrast for empty overflow text" into rvc-dev am: b16cc11834 am: 43798166f5

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

Change-Id: I86bf448acd61dcaf42d4b3ec21c06ae26dcc76b9
This commit is contained in:
TreeHugger Robot
2020-06-19 23:51:34 +00:00
committed by Automerger Merge Worker
parent 6569e828a8 43798166f5
commit 7f5273afd6
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java
View File

@@ -57,6 +57,8 @@ public class BubbleOverflowActivity extends Activity {
private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleOverflowActivity" : TAG_BUBBLES; private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleOverflowActivity" : TAG_BUBBLES;
private LinearLayout mEmptyState; private LinearLayout mEmptyState;
private TextView mEmptyStateTitle;
private TextView mEmptyStateSubtitle;
private ImageView mEmptyStateImage; private ImageView mEmptyStateImage;
private BubbleController mBubbleController; private BubbleController mBubbleController;
private BubbleOverflowAdapter mAdapter; private BubbleOverflowAdapter mAdapter;
@@ -100,8 +102,10 @@ public class BubbleOverflowActivity extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.bubble_overflow_activity); setContentView(R.layout.bubble_overflow_activity);
mEmptyState = findViewById(R.id.bubble_overflow_empty_state);
mRecyclerView = findViewById(R.id.bubble_overflow_recycler); mRecyclerView = findViewById(R.id.bubble_overflow_recycler);
mEmptyState = findViewById(R.id.bubble_overflow_empty_state);
mEmptyStateTitle = findViewById(R.id.bubble_overflow_empty_title);
mEmptyStateSubtitle = findViewById(R.id.bubble_overflow_empty_subtitle);
mEmptyStateImage = findViewById(R.id.bubble_overflow_empty_state_image); mEmptyStateImage = findViewById(R.id.bubble_overflow_empty_state_image);
updateDimensions(); updateDimensions();
@@ -141,21 +145,27 @@ public class BubbleOverflowActivity extends Activity {
void updateTheme() { void updateTheme() {
Resources res = getResources(); Resources res = getResources();
final int mode = res.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; final int mode = res.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
switch (mode) { final boolean isNightMode = (mode == Configuration.UI_MODE_NIGHT_YES);
case Configuration.UI_MODE_NIGHT_YES:
mEmptyStateImage.setImageDrawable(
res.getDrawable(R.drawable.ic_empty_bubble_overflow_dark));
findViewById(android.R.id.content)
.setBackgroundColor(res.getColor(R.color.bubbles_dark));
break;
case Configuration.UI_MODE_NIGHT_NO: mEmptyStateImage.setImageDrawable(isNightMode
mEmptyStateImage.setImageDrawable( ? res.getDrawable(R.drawable.ic_empty_bubble_overflow_dark)
res.getDrawable(R.drawable.ic_empty_bubble_overflow_light)); : res.getDrawable(R.drawable.ic_empty_bubble_overflow_light));
findViewById(android.R.id.content)
.setBackgroundColor(res.getColor(R.color.bubbles_light)); findViewById(android.R.id.content)
break; .setBackgroundColor(isNightMode
} ? res.getColor(R.color.bubbles_dark)
: res.getColor(R.color.bubbles_light));
final TypedArray typedArray = getApplicationContext().obtainStyledAttributes(
new int[]{android.R.attr.colorBackgroundFloating,
android.R.attr.textColorSecondary});
int bgColor = typedArray.getColor(0, isNightMode ? Color.BLACK : Color.WHITE);
int textColor = typedArray.getColor(1, isNightMode ? Color.WHITE : Color.BLACK);
textColor = ContrastColorUtil.ensureTextContrast(textColor, bgColor, isNightMode);
typedArray.recycle();
mEmptyStateTitle.setTextColor(textColor);
mEmptyStateSubtitle.setTextColor(textColor);
} }
void onDataChanged(List<Bubble> bubbles) { void onDataChanged(List<Bubble> bubbles) {