From 3e14383a283e100cdc14818b2084026f2df22dbe Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 7 May 2019 15:14:09 -0700 Subject: [PATCH] Display settings homepage content fully edge-to-edge This is needed to support fully gesture navigation. Bug: 132182711 Test: visual Change-Id: Ifaf15ecec73b974356355a74e73754f95b84ad3e --- res/layout/settings_homepage_container.xml | 4 ++- res/values-night/colors.xml | 26 +++++++++---------- res/values/colors.xml | 7 +++-- res/values/themes.xml | 3 +-- .../homepage/SettingsHomepageActivity.java | 23 +++++----------- .../SettingsHomepageActivityTest.java | 5 +--- 6 files changed, 26 insertions(+), 42 deletions(-) diff --git a/res/layout/settings_homepage_container.xml b/res/layout/settings_homepage_container.xml index 856bd8085b7..7f1954b6465 100644 --- a/res/layout/settings_homepage_container.xml +++ b/res/layout/settings_homepage_container.xml @@ -18,6 +18,8 @@ @@ -57,7 +59,7 @@ diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml index 4c432576120..f7612173840 100644 --- a/res/values-night/colors.xml +++ b/res/values-night/colors.xml @@ -15,19 +15,17 @@ --> - #82000000 - @android:color/black - #783BE5 - #3F5FBD - - #cc000000 - @*android:color/material_grey_900 - @*android:color/material_grey_900 - @*android:color/material_grey_800 - - @*android:color/material_grey_800 - @*android:color/material_grey_800 - #AECBFA - #5F6368 + #82000000 + @android:color/black + #783BE5 + #3F5FBD + @*android:color/material_grey_900 + @*android:color/material_grey_900 + @*android:color/material_grey_800 + + @*android:color/material_grey_800 + @*android:color/material_grey_800 + #AECBFA + #5F6368 diff --git a/res/values/colors.xml b/res/values/colors.xml index 42fa3f97fe7..4a4c896a770 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -23,7 +23,9 @@ #20ffffff @android:color/holo_blue_light - @color/lock_pattern_view_regular_color + + @color/lock_pattern_view_regular_color + #ff84ffff @color/sud_color_accent_light #fff44336 @@ -133,9 +135,6 @@ @*android:color/accent_device_default_light - - #ccFFFFFF - #ffdadce0 #ff1a73e8 diff --git a/res/values/themes.xml b/res/values/themes.xml index 951bb048960..4edd943a224 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -197,9 +197,8 @@ @*android:color/primary_dark_device_default_settings_light true @*android:color/ripple_material_light - @android:color/white + @android:color/transparent @android:color/white - true diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java index 6d16d7f56cb..e7676649f3f 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java @@ -42,8 +42,11 @@ public class SettingsHomepageActivity extends SettingsBaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - updateWindowProperties(); setContentView(R.layout.settings_homepage_container); + final View root = findViewById(R.id.settings_homepage_container); + root.setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); + setHomepageContainerPaddingTop(); final Toolbar toolbar = findViewById(R.id.search_action_bar); @@ -76,29 +79,15 @@ public class SettingsHomepageActivity extends SettingsBaseActivity { fragmentTransaction.commit(); } - private void updateWindowProperties() { - final View decorView = getWindow().getDecorView(); - decorView.setSystemUiVisibility( - decorView.getSystemUiVisibility() | - View.SYSTEM_UI_FLAG_LAYOUT_STABLE | - View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - ); - - getWindow().setStatusBarColor(getColor(R.color.homepage_status_bar_color)); - } - @VisibleForTesting void setHomepageContainerPaddingTop() { final View view = this.findViewById(R.id.homepage_container); - final int statusBarHeight = getResources().getDimensionPixelSize( - com.android.internal.R.dimen.status_bar_height); final int searchBarHeight = getResources().getDimensionPixelSize(R.dimen.search_bar_height); final int searchBarMargin = getResources().getDimensionPixelSize(R.dimen.search_bar_margin); - // The top padding is the height of status bar + height of action bar(48dp) + top/bottom - // margins(16dp) - final int paddingTop = statusBarHeight + searchBarHeight + searchBarMargin * 2; + // The top padding is the height of action bar(48dp) + top/bottom margins(16dp) + final int paddingTop = searchBarHeight + searchBarMargin * 2; view.setPadding(0 /* left */, paddingTop, 0 /* right */, 0 /* bottom */); } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java index 50a798f744b..dcb32c4c475 100644 --- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java +++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java @@ -35,8 +35,6 @@ public class SettingsHomepageActivityTest { public void setHomepageContainerPaddingTop_shouldBeSetPaddingTop() { final SettingsHomepageActivity activity = Robolectric.buildActivity( SettingsHomepageActivity.class).create().get(); - final int statusBarHeight = activity.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.status_bar_height); final int searchBarHeight = activity.getResources().getDimensionPixelSize( R.dimen.search_bar_height); final int searchBarMargin = activity.getResources().getDimensionPixelSize( @@ -46,8 +44,7 @@ public class SettingsHomepageActivityTest { activity.setHomepageContainerPaddingTop(); final int actualPaddingTop = view.getPaddingTop(); - assertThat(actualPaddingTop).isEqualTo( - statusBarHeight + searchBarHeight + searchBarMargin * 2); + assertThat(actualPaddingTop).isEqualTo(searchBarHeight + searchBarMargin * 2); } @Test