Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0f257eb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Show a line below the tabs in tabbed view to align with UX mocks."

parents 69ae2cc3 934c64ca

core/java/com/android/internal/app/ChooserActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -3100,7 +3100,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));

            }

core/java/com/android/internal/app/ResolverActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -1566,6 +1566,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) {

core/res/res/layout/chooser_grid.xml

+8 −0
Original line number Diff line number Diff line
@@ -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"

core/res/res/layout/resolver_list.xml

+8 −4
Original line number Diff line number Diff line
@@ -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>

core/res/res/layout/resolver_list_per_profile.xml

+0 −1
Original line number Diff line number Diff line
@@ -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"