Change navbar icons when overview proxy service is enabled (1/2)
Changed the home button to a longer bar oval shape and back button to be outlined instead of filled. Change opalayout to make the home button larger when connected to launcher. Decrease the nav icons by 2dp in size. Bug: 67957962 Test: manual Change-Id: Ia70ea6704278948e333cb9540ff599dbe657de2c
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
@@ -884,7 +884,7 @@
|
||||
<dimen name="nav_quick_scrub_track_thickness">2dp</dimen>
|
||||
|
||||
<!-- Home button padding for sizing -->
|
||||
<dimen name="home_padding">15dp</dimen>
|
||||
<dimen name="home_padding">16dp</dimen>
|
||||
|
||||
<!-- Smart reply button -->
|
||||
<dimen name="smart_reply_button_corner_radius">24dip</dimen>
|
||||
|
||||
@@ -217,6 +217,9 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
|
||||
mShowAccessibilityButton = false;
|
||||
mLongClickableAccessibilityButton = false;
|
||||
|
||||
mOverviewProxyService = Dependency.get(OverviewProxyService.class);
|
||||
mRecentsOnboarding = new RecentsOnboarding(context, mOverviewProxyService);
|
||||
|
||||
mConfiguration = new Configuration();
|
||||
mConfiguration.updateFrom(context.getResources().getConfiguration());
|
||||
updateIcons(context, Configuration.EMPTY, mConfiguration);
|
||||
@@ -232,9 +235,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
|
||||
new ButtonDispatcher(R.id.accessibility_button));
|
||||
mButtonDispatchers.put(R.id.rotate_suggestion,
|
||||
new ButtonDispatcher(R.id.rotate_suggestion));
|
||||
|
||||
mOverviewProxyService = Dependency.get(OverviewProxyService.class);
|
||||
mRecentsOnboarding = new RecentsOnboarding(context, mOverviewProxyService);
|
||||
}
|
||||
|
||||
public BarTransitions getBarTransitions() {
|
||||
@@ -355,14 +355,23 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
|
||||
}
|
||||
if (oldConfig.densityDpi != newConfig.densityDpi
|
||||
|| oldConfig.getLayoutDirection() != newConfig.getLayoutDirection()) {
|
||||
mBackIcon = getDrawable(ctx, R.drawable.ic_sysbar_back, R.drawable.ic_sysbar_back_dark);
|
||||
final boolean proxyAvailable = mOverviewProxyService.getProxy() != null;
|
||||
mBackIcon = proxyAvailable
|
||||
? getDrawable(ctx, R.drawable.ic_sysbar_back_quick_step,
|
||||
R.drawable.ic_sysbar_back_quick_step_dark)
|
||||
: getDrawable(ctx, R.drawable.ic_sysbar_back, R.drawable.ic_sysbar_back_dark);
|
||||
mBackLandIcon = mBackIcon;
|
||||
mBackAltIcon = getDrawable(ctx,
|
||||
R.drawable.ic_sysbar_back_ime, R.drawable.ic_sysbar_back_ime_dark);
|
||||
mBackAltIcon = proxyAvailable
|
||||
? getDrawable(ctx, R.drawable.ic_sysbar_back_ime_quick_step,
|
||||
R.drawable.ic_sysbar_back_ime_quick_step_dark)
|
||||
: getDrawable(ctx, R.drawable.ic_sysbar_back_ime,
|
||||
R.drawable.ic_sysbar_back_ime_dark);
|
||||
mBackAltLandIcon = mBackAltIcon;
|
||||
|
||||
mHomeDefaultIcon = getDrawable(ctx,
|
||||
R.drawable.ic_sysbar_home, R.drawable.ic_sysbar_home_dark);
|
||||
mHomeDefaultIcon = proxyAvailable
|
||||
? getDrawable(ctx, R.drawable.ic_sysbar_home_quick_step,
|
||||
R.drawable.ic_sysbar_home_quick_step_dark)
|
||||
: getDrawable(ctx, R.drawable.ic_sysbar_home, R.drawable.ic_sysbar_home_dark);
|
||||
mRecentIcon = getDrawable(ctx,
|
||||
R.drawable.ic_sysbar_recent, R.drawable.ic_sysbar_recent_dark);
|
||||
mMenuIcon = getDrawable(ctx, R.drawable.ic_sysbar_menu, R.drawable.ic_sysbar_menu_dark);
|
||||
@@ -666,6 +675,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
|
||||
setSlippery(!isConnected);
|
||||
setDisabledFlags(mDisabledFlags, true);
|
||||
setUpSwipeUpOnboarding(isConnected);
|
||||
updateIcons(getContext(), Configuration.EMPTY, mConfiguration);
|
||||
setNavigationIconHints(mNavigationIconHints, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||