diff options
5 files changed, 23 insertions, 14 deletions
diff --git a/packages/SystemUI/res/values-sw600dp/config.xml b/packages/SystemUI/res/values-sw600dp/config.xml index 5aafb66..83477c0 100644 --- a/packages/SystemUI/res/values-sw600dp/config.xml +++ b/packages/SystemUI/res/values-sw600dp/config.xml @@ -33,6 +33,8 @@ <!-- Set to true to enable the user switcher on the keyguard. --> <bool name="config_keyguardUserSwitcher">true</bool> - <!-- Transposes the recents layout in landscape. --> - <bool name="recents_transpose_layout_with_orientation">false</bool> + <!-- Transposes the search bar layout in landscape. --> + <bool name="recents_has_transposed_search_bar">true</bool> + <!-- Transposes the nav bar in landscape (only used for purposes of layout). --> + <bool name="recents_has_transposed_nav_bar">false</bool> </resources> diff --git a/packages/SystemUI/res/values-sw720dp/config.xml b/packages/SystemUI/res/values-sw720dp/config.xml index d8bb8d7d..fbeadcd 100644 --- a/packages/SystemUI/res/values-sw720dp/config.xml +++ b/packages/SystemUI/res/values-sw720dp/config.xml @@ -39,5 +39,10 @@ <!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow card. --> <integer name="keyguard_max_notification_count">5</integer> + + <!-- Transposes the search bar layout in landscape. --> + <bool name="recents_has_transposed_search_bar">false</bool> + <!-- Transposes the nav bar in landscape (only used for purposes of layout). --> + <bool name="recents_has_transposed_nav_bar">false</bool> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 0e18979..c85e1d2 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -152,8 +152,10 @@ <integer name="recents_max_task_stack_view_dim">96</integer> <!-- The delay to enforce between each alt-tab key press. --> <integer name="recents_alt_tab_key_delay">200</integer> - <!-- Transposes the recents layout in landscape. --> - <bool name="recents_transpose_layout_with_orientation">true</bool> + <!-- Transposes the search bar layout in landscape. --> + <bool name="recents_has_transposed_search_bar">true</bool> + <!-- Transposes the nav bar in landscape (only used for purposes of layout). --> + <bool name="recents_has_transposed_nav_bar">true</bool> <!-- Whether to enable KeyguardService or not --> <bool name="config_enableKeyguardService">true</bool> diff --git a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java index 2d114c0..9cb310b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java +++ b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java @@ -241,8 +241,8 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta mConfig = RecentsConfiguration.reinitialize(mContext, mSystemServicesProxy); mConfig.updateOnConfigurationChange(); mConfig.getTaskStackBounds(mWindowRect.width(), mWindowRect.height(), mStatusBarHeight, - mNavBarWidth, mTaskStackBounds); - if (mConfig.isLandscape && mConfig.transposeRecentsLayoutWithOrientation) { + (mConfig.hasTransposedNavBar ? mNavBarWidth : 0), mTaskStackBounds); + if (mConfig.isLandscape && mConfig.hasTransposedNavBar) { mSystemInsets.set(0, mStatusBarHeight, mNavBarWidth, 0); } else { mSystemInsets.set(0, mStatusBarHeight, 0, mNavBarHeight); diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java index 5d8181c..dea314e 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java @@ -57,7 +57,8 @@ public class RecentsConfiguration { /** Layout */ boolean isLandscape; - boolean transposeRecentsLayoutWithOrientation; + boolean hasTransposedSearchBar; + boolean hasTransposedNavBar; /** Loading */ public int maxNumTasksToLoad; @@ -173,8 +174,8 @@ public class RecentsConfiguration { // Layout isLandscape = res.getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; - transposeRecentsLayoutWithOrientation = - res.getBoolean(R.bool.recents_transpose_layout_with_orientation); + hasTransposedSearchBar = res.getBoolean(R.bool.recents_has_transposed_search_bar); + hasTransposedNavBar = res.getBoolean(R.bool.recents_has_transposed_nav_bar); // Insets displayRect.set(0, 0, dm.widthPixels, dm.heightPixels); @@ -326,13 +327,12 @@ public class RecentsConfiguration { /** Returns whether the nav bar scrim should be visible. */ public boolean hasNavBarScrim() { // Only show the scrim if we have recent tasks, and if the nav bar is not transposed - return !launchedWithNoRecentTasks && - (!transposeRecentsLayoutWithOrientation || !isLandscape); + return !launchedWithNoRecentTasks && (!hasTransposedNavBar || !isLandscape); } /** Returns whether the current layout is horizontal. */ public boolean hasHorizontalLayout() { - return isLandscape && transposeRecentsLayoutWithOrientation; + return isLandscape && hasTransposedSearchBar; } /** @@ -343,7 +343,7 @@ public class RecentsConfiguration { Rect taskStackBounds) { Rect searchBarBounds = new Rect(); getSearchBarBounds(windowWidth, windowHeight, topInset, searchBarBounds); - if (isLandscape && transposeRecentsLayoutWithOrientation) { + if (isLandscape && hasTransposedSearchBar) { // In landscape, the search bar appears on the left taskStackBounds.set(searchBarBounds.right, topInset, windowWidth - rightInset, windowHeight); } else { @@ -364,7 +364,7 @@ public class RecentsConfiguration { searchBarSize = 0; } - if (isLandscape && transposeRecentsLayoutWithOrientation) { + if (isLandscape && hasTransposedSearchBar) { // In landscape, the search bar appears on the left searchBarSpaceBounds.set(0, topInset, searchBarSize, windowHeight); } else { |