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

Commit 579188ae authored by Jagrut Desai's avatar Jagrut Desai
Browse files

Refactor taskbar divider view to IconButtonView 

- Breakout CL part 1
- This is a breakout cl from ag/24272821 to make it more readable and atomic.
- This cl consist refactoring of Taskbar Divider Line to be using IconButtonView.

Test: Manual, Visual
Bug: 265170176
Flag: ENABLE_TASKBAR_PINNING
Change-Id: I6719dd568986dce7cf9cdf0f287c3f079fd35ba6
parent b3614355

quickstep/res/drawable/taskbar_divider_bg.xml→quickstep/res/drawable/taskbar_divider_button.xml

+15 −5
Original line number Diff line number Diff line
@@ -13,8 +13,18 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:shape="rectangle" >

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

    <corners android:radius="1dp" />

</shape>
 


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

    android:width="52dp"

    android:height="52dp"

    android:viewportHeight="52"

    android:viewportWidth="52">

    <group>

        <path

            android:fillColor="@color/taskbar_divider_background"

            android:pathData="M26,11L26,41"

            android:strokeColor="@color/taskbar_divider_background"

            android:strokeLineCap="round"

            android:strokeWidth="2" />

    </group>

</vector>
 
 No newline at end of file

quickstep/res/layout/taskbar_divider.xml

+2 −9
Original line number Diff line number Diff line
@@ -13,16 +13,9 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<FrameLayout

<com.android.launcher3.views.IconButtonView

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

    android:layout_width="@dimen/taskbar_icon_min_touch_size"

    android:layout_height="@dimen/taskbar_icon_min_touch_size"

    android:contentDescription="@string/taskbar_divider_a11y_title"

    android:backgroundTint="@android:color/transparent">



    <View

        android:layout_height="32dp"

        android:layout_width="2dp"

        android:layout_gravity="center"

        android:background="@drawable/taskbar_divider_bg" />

</FrameLayout>
 
 No newline at end of file
 
    android:backgroundTint="@android:color/transparent" />
 
 No newline at end of file

quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

+6 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
    private @Nullable IconButtonView mAllAppsButton;



    // Only non-null when device supports having an All Apps button.

    private @Nullable View mTaskbarDivider;

    private @Nullable IconButtonView mTaskbarDivider;



    private View mQsb;
@@ -158,8 +158,12 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
                    mActivityContext.getColor(R.color.all_apps_button_color));



            if (FeatureFlags.ENABLE_TASKBAR_PINNING.get()) {

                mTaskbarDivider = LayoutInflater.from(context).inflate(R.layout.taskbar_divider,

                mTaskbarDivider = (IconButtonView) LayoutInflater.from(context).inflate(

                        R.layout.taskbar_divider,

                        this, false);

                mTaskbarDivider.setIconDrawable(

                        resources.getDrawable(R.drawable.taskbar_divider_button));

                mTaskbarDivider.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding);

            }

        }