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

Commit c9d5391b authored by Steven Ng's avatar Steven Ng Committed by Android (Google) Code Review
Browse files

Merge "Refine all apps tabs alignment & remove ripple effect from tabs" into sc-dev

parents bf60673b be2dc65f

res/drawable/all_apps_tabs_background.xml

+5 −9
Original line number Diff line number Diff line
@@ -14,19 +14,15 @@ 
     limitations under the License.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android"

    android:enterFadeDuration="500">

    android:enterFadeDuration="100">

    <item

        android:id="@+id/unselected"

        android:state_selected="false">

        <ripple android:color="@color/all_apps_tab_background_selected">

            <item>

        <shape android:shape="rectangle">

            <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />

            <solid android:color="@color/all_apps_tabs_background" />

        </shape>

    </item>

        </ripple>

    </item>



    <item

        android:id="@+id/selected"

src/com/android/launcher3/allapps/AllAppsRecyclerView.java

+2 −2
Original line number Diff line number Diff line
@@ -454,8 +454,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView { 
     */

    public int getTabWidth() {

        DeviceProfile grid = BaseDraggingActivity.fromContext(getContext()).getDeviceProfile();

        int totalWidth = (grid.availableWidthPx - getPaddingLeft() - getPaddingRight());

        int totalWidth = getMeasuredWidth() - getPaddingLeft() - getPaddingRight();

        int iconPadding = totalWidth / grid.numShownAllAppsColumns - grid.allAppsIconSizePx;

        return totalWidth - iconPadding;

        return totalWidth - iconPadding - grid.allAppsIconDrawablePaddingPx;

    }

}

src/com/android/launcher3/allapps/FloatingHeaderView.java

+8 −2
Original line number Diff line number Diff line
@@ -154,6 +154,14 @@ public class FloatingHeaderView extends LinearLayout implements 
        PluginManagerWrapper.INSTANCE.get(getContext()).removePluginListener(this);

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        if (mMainRV != null) {

            mTabLayout.getLayoutParams().width = mMainRV.getTabWidth();

        }

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

    }



    private void recreateAllRowsArray() {

        int pluginCount = mPluginRows.size();

        if (pluginCount == 0) {
@@ -224,8 +232,6 @@ public class FloatingHeaderView extends LinearLayout implements 


        mTabsHidden = tabsHidden;

        mTabLayout.setVisibility(tabsHidden ? View.GONE : View.VISIBLE);

        mTabLayout.getLayoutParams().width =

                mAH[AllAppsContainerView.AdapterHolder.MAIN].recyclerView.getTabWidth();

        mMainRV = setupRV(mMainRV, mAH[AllAppsContainerView.AdapterHolder.MAIN].recyclerView);

        mWorkRV = setupRV(mWorkRV, mAH[AllAppsContainerView.AdapterHolder.WORK].recyclerView);

        mParent = (ViewGroup) mMainRV.getParent();