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

Merge "Sharesheet - navbar color integration" into qt-dev

Browse Source 
am: 592192f813

Change-Id: I0442758413728fb89b405a1b140832fae031b881
This commit is contained in:
Matt Pietal
2019-04-10 14:01:12 -07:00
committed by android-build-merger
parent 3344ab548e 592192f813
commit db87d7c805
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -2592,10 +2592,8 @@ public class ChooserActivity extends ResolverActivity {
if (startType != lastStartType || rowPosition == getContentPreviewRowCount()) {
row.setBackground(mChooserRowLayer);
setVertPadding(row, 0, 0);
} else {
row.setBackground(null);
setVertPadding(row, 0, 0);
}
int columnCount = holder.getColumnCount();
@@ -2642,10 +2640,6 @@ public class ChooserActivity extends ResolverActivity {
}
}
private void setVertPadding(ViewGroup row, int top, int bottom) {
row.setPadding(row.getPaddingLeft(), top, row.getPaddingRight(), bottom);
}
int getFirstRowPosition(int row) {
row -= getContentPreviewRowCount();

4
core/res/res/values-night/colors.xml
View File

@@ -28,4 +28,6 @@
<!-- The background color of a notification card. -->
<color name="notification_material_background_color">@color/black</color>
</resources>
<color name="chooser_row_divider">@color/list_divider_color_dark</color>
</resources>

4
core/res/res/values-night/themes_device_defaults.xml
View File

@@ -71,4 +71,8 @@ easier.
<style name="ThemeOverlay.DeviceDefault.Accent.DayNight"
parent="@style/ThemeOverlay.DeviceDefault.Accent" />
<style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.ResolverCommon">
<item name="windowLightNavigationBar">false</item>
</style>
</resources>

3
core/res/res/values/colors.xml
View File

@@ -215,6 +215,5 @@
<!-- Magnifier -->
<color name="default_magnifier_color_overlay">#00FFFFFF</color>
<color name="chooser_row_divider">#1f000000</color>
<color name="chooser_row_divider">@color/list_divider_color_light</color>
</resources>

8
core/res/res/values/themes_device_defaults.xml
View File

@@ -1658,7 +1658,7 @@ easier.
<style name="Theme.DeviceDefault.DayNight" parent="Theme.DeviceDefault.Light" />
<!-- Theme used for the intent picker activity. -->
<style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.DayNight">
<style name="Theme.DeviceDefault.ResolverCommon" parent="Theme.DeviceDefault.DayNight">
<item name="windowEnterTransition">@empty</item>
<item name="windowExitTransition">@empty</item>
<item name="windowIsTranslucent">true</item>
@@ -1670,6 +1670,12 @@ easier.
<item name="colorControlActivated">?attr/colorControlHighlight</item>
<item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>
<item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>
<item name="navigationBarColor">?attr/colorBackgroundFloating</item>
<item name="navigationBarDividerColor">@color/chooser_row_divider</item>
</style>
<style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.ResolverCommon">
<item name="windowLightNavigationBar">true</item>
</style>
<!-- @hide DeviceDefault themes for the autofill FillUi -->