diff options
| -rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/app/ResolverActivity.java | 1 | ||||
| -rw-r--r-- | core/res/res/layout/chooser_grid.xml | 8 | ||||
| -rw-r--r-- | core/res/res/layout/resolver_list.xml | 12 | ||||
| -rw-r--r-- | core/res/res/layout/resolver_list_per_profile.xml | 1 | ||||
| -rw-r--r-- | core/res/res/layout/resolver_list_with_default.xml | 13 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
7 files changed, 28 insertions, 10 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 8618bcfc3932..16db2480e2bd 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -3095,7 +3095,7 @@ public class ChooserActivity extends ResolverActivity implements final ViewGroup viewGroup = (ViewGroup) holder.itemView; int start = getListPosition(position); int startType = getRowType(start); - if (viewGroup.getForeground() == null) { + if (viewGroup.getForeground() == null && position > 0) { viewGroup.setForeground( getResources().getDrawable(R.drawable.chooser_row_layer_list, null)); } diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 409ae347f515..36d848c365f0 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -1535,6 +1535,7 @@ public class ResolverActivity extends Activity implements viewPager.setVisibility(View.VISIBLE); tabHost.setCurrentTab(mMultiProfilePagerAdapter.getCurrentPage()); mMultiProfilePagerAdapter.setOnProfileSelectedListener(tabHost::setCurrentTab); + findViewById(R.id.resolver_tab_divider).setVisibility(View.VISIBLE); } private void resetTabsHeaderStyle(TabWidget tabWidget) { diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml index 24a21ebcad80..c0de6936dd12 100644 --- a/core/res/res/layout/chooser_grid.xml +++ b/core/res/res/layout/chooser_grid.xml @@ -78,6 +78,14 @@ android:layout_height="wrap_content" android:visibility="gone"> </TabWidget> + <View + android:id="@+id/resolver_tab_divider" + android:visibility="gone" + android:layout_alwaysShow="true" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?attr/colorBackgroundFloating" + android:foreground="?attr/dividerVertical" /> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" diff --git a/core/res/res/layout/resolver_list.xml b/core/res/res/layout/resolver_list.xml index b4e628620853..4359b1011064 100644 --- a/core/res/res/layout/resolver_list.xml +++ b/core/res/res/layout/resolver_list.xml @@ -94,6 +94,13 @@ android:layout_height="wrap_content" android:visibility="gone"> </TabWidget> + <View + android:id="@+id/resolver_tab_divider" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?attr/colorBackgroundFloating" + android:foreground="?attr/dividerVertical" /> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" @@ -102,10 +109,7 @@ android:id="@+id/profile_pager" android:layout_width="match_parent" android:layout_height="wrap_content" - android:divider="?attr/dividerVertical" - android:footerDividersEnabled="false" - android:headerDividersEnabled="false" - android:dividerHeight="1dp"/> + android:minHeight="@dimen/resolver_empty_state_height" /> </FrameLayout> </LinearLayout> </TabHost> diff --git a/core/res/res/layout/resolver_list_per_profile.xml b/core/res/res/layout/resolver_list_per_profile.xml index d481eff9702c..c4f9ed90b49a 100644 --- a/core/res/res/layout/resolver_list_per_profile.xml +++ b/core/res/res/layout/resolver_list_per_profile.xml @@ -29,7 +29,6 @@ android:elevation="@dimen/resolver_elevation" android:nestedScrollingEnabled="true" android:scrollbarStyle="outsideOverlay" - android:scrollIndicators="top|bottom" android:divider="@null" android:footerDividersEnabled="false" android:headerDividersEnabled="false" diff --git a/core/res/res/layout/resolver_list_with_default.xml b/core/res/res/layout/resolver_list_with_default.xml index b54673834ea9..72e8b0c2c5d5 100644 --- a/core/res/res/layout/resolver_list_with_default.xml +++ b/core/res/res/layout/resolver_list_with_default.xml @@ -175,6 +175,14 @@ android:layout_height="wrap_content" android:visibility="gone"> </TabWidget> + <View + android:id="@+id/resolver_tab_divider" + android:visibility="gone" + android:layout_alwaysShow="true" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?attr/colorBackgroundFloating" + android:foreground="?attr/dividerVertical" /> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" @@ -183,10 +191,7 @@ android:id="@+id/profile_pager" android:layout_width="match_parent" android:layout_height="wrap_content" - android:dividerHeight="1dp" - android:divider="?attr/dividerVertical" - android:footerDividersEnabled="false" - android:headerDividersEnabled="false"/> + android:minHeight="@dimen/resolver_empty_state_height" /> </FrameLayout> </LinearLayout> </TabHost> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index b8dd418da173..85c2a2a24749 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3874,6 +3874,7 @@ <java-symbol type="id" name="resolver_empty_state_title" /> <java-symbol type="id" name="resolver_empty_state_subtitle" /> <java-symbol type="id" name="resolver_empty_state_button" /> + <java-symbol type="id" name="resolver_tab_divider" /> <java-symbol type="string" name="resolver_cant_share_with_work_apps" /> <java-symbol type="string" name="resolver_cant_share_with_personal_apps" /> <java-symbol type="string" name="resolver_cant_share_cross_profile_explanation" /> |