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

Merge "Increase collapsed height for resolver list with default and tabs" into rvc-dev am: 42987638f5

Browse Source 
Change-Id: I04646bd1752172146d7a038132960467f8ec591a
This commit is contained in:
TreeHugger Robot
2020-04-14 18:55:54 +00:00
committed by Automerger Merge Worker
parent e12f43485b 42987638f5
commit 3ccffa5e5b
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -398,11 +398,6 @@ public class ResolverActivity extends Activity implements
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE); | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
rdl.setOnApplyWindowInsetsListener(this::onApplyWindowInsets); rdl.setOnApplyWindowInsetsListener(this::onApplyWindowInsets);
if (shouldShowTabs() && isIntentPicker()) {
rdl.setMaxCollapsedHeight(getResources()
.getDimensionPixelSize(R.dimen.resolver_max_collapsed_height_with_tabs));
}
mResolverDrawerLayout = rdl; mResolverDrawerLayout = rdl;
} }
@@ -1012,6 +1007,15 @@ public class ResolverActivity extends Activity implements
protected void onListRebuilt(ResolverListAdapter listAdapter) { protected void onListRebuilt(ResolverListAdapter listAdapter) {
final ItemClickListener listener = new ItemClickListener(); final ItemClickListener listener = new ItemClickListener();
setupAdapterListView((ListView) mMultiProfilePagerAdapter.getActiveAdapterView(), listener); setupAdapterListView((ListView) mMultiProfilePagerAdapter.getActiveAdapterView(), listener);
if (shouldShowTabs() && isIntentPicker()) {
final ResolverDrawerLayout rdl = findViewById(R.id.contentPanel);
if (rdl != null) {
rdl.setMaxCollapsedHeight(getResources()
.getDimensionPixelSize(useLayoutWithDefault()
? R.dimen.resolver_max_collapsed_height_with_default_with_tabs
: R.dimen.resolver_max_collapsed_height_with_tabs));
}
}
} }
protected boolean onTargetSelected(TargetInfo target, boolean alwaysCheck) { protected boolean onTargetSelected(TargetInfo target, boolean alwaysCheck) {

2
core/res/res/layout/resolver_list_with_default.xml
View File

@@ -21,7 +21,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:maxWidth="@dimen/resolver_max_width" android:maxWidth="@dimen/resolver_max_width"
android:maxCollapsedHeight="144dp" android:maxCollapsedHeight="@dimen/resolver_max_collapsed_height_with_default"
android:id="@id/contentPanel"> android:id="@id/contentPanel">
<LinearLayout <LinearLayout

4
core/res/res/values/dimens.xml
View File

@@ -820,7 +820,9 @@
<dimen name="resolver_empty_state_height">212dp</dimen> <dimen name="resolver_empty_state_height">212dp</dimen>
<dimen name="resolver_empty_state_height_with_tabs">268dp</dimen> <dimen name="resolver_empty_state_height_with_tabs">268dp</dimen>
<dimen name="resolver_max_collapsed_height">192dp</dimen> <dimen name="resolver_max_collapsed_height">192dp</dimen>
<dimen name="resolver_max_collapsed_height_with_tabs">248dp</dimen> <dimen name="resolver_max_collapsed_height_with_tabs">268dp</dimen>
<dimen name="resolver_max_collapsed_height_with_default">144dp</dimen>
<dimen name="resolver_max_collapsed_height_with_default_with_tabs">300dp</dimen>
<dimen name="resolver_tab_text_size">14sp</dimen> <dimen name="resolver_tab_text_size">14sp</dimen>
<dimen name="chooser_action_button_icon_size">18dp</dimen> <dimen name="chooser_action_button_icon_size">18dp</dimen>

1
core/res/res/values/symbols.xml
View File

@@ -3938,6 +3938,7 @@
<java-symbol type="dimen" name="resolver_empty_state_height" /> <java-symbol type="dimen" name="resolver_empty_state_height" />
<java-symbol type="dimen" name="resolver_empty_state_height_with_tabs" /> <java-symbol type="dimen" name="resolver_empty_state_height_with_tabs" />
<java-symbol type="dimen" name="resolver_max_collapsed_height_with_tabs" /> <java-symbol type="dimen" name="resolver_max_collapsed_height_with_tabs" />
<java-symbol type="dimen" name="resolver_max_collapsed_height_with_default_with_tabs" />
<java-symbol type="bool" name="resolver_landscape_phone" /> <java-symbol type="bool" name="resolver_landscape_phone" />
<java-symbol type="dimen" name="resolver_tab_text_size" /> <java-symbol type="dimen" name="resolver_tab_text_size" />