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

Commit c15fd5c2 authored by Andy Wickham's avatar Andy Wickham Committed by Android (Google) Code Review
Browse files

Merge "Revert^3 "Change Overview Actions to round buttons."" into udc-qpr-dev

parents 6682d58d bc3bac41

go/quickstep/res/drawable/ic_listen.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ 
        android:viewportHeight="24"

        android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@color/overview_button"

      android:fillColor="@android:color/white"

      android:pathData="M15.08,7.05c0.84,1.18 0.84,2.71 0,3.89l1.68,1.69c2.02,-2.02 2.02,-5.07 0,-7.27l-1.68,1.69zM20.07,2l-1.63,1.63c2.77,3.02 2.77,7.56 0,10.74L20.07,16c3.9,-3.89 3.91,-9.95 0,-14zM9,13c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM9,7c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM9,14c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4zM15,19L3,19v-0.99C3.2,17.29 6.3,16 9,16s5.8,1.29 6,2v1z"/>

</vector>

go/quickstep/res/drawable/ic_search.xml

+5 −5
Original line number Diff line number Diff line
@@ -19,18 +19,18 @@ 
        android:viewportHeight="24"

        android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@color/overview_button"

      android:fillColor="@android:color/white"

      android:pathData="M16,3h-2v2h2c1.65,0 3,1.35 3,3v2h2V8C21,5.24 18.76,3 16,3z"/>

  <path

      android:fillColor="@color/overview_button"

      android:fillColor="@android:color/white"

      android:pathData="M5,16v-2H3v2c0,2.76 2.24,5 5,5h2v-2H8C6.35,19 5,17.65 5,16z"/>

  <path

      android:fillColor="@color/overview_button"

      android:fillColor="@android:color/white"

      android:pathData="M12,8.5c-1.93,0 -3.5,1.57 -3.5,3.5s1.57,3.5 3.5,3.5s3.5,-1.57 3.5,-3.5S13.93,8.5 12,8.5z"/>

  <path

      android:fillColor="@color/overview_button"

      android:fillColor="@android:color/white"

      android:pathData="M18,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>

  <path

      android:fillColor="@color/overview_button"

      android:fillColor="@android:color/white"

      android:pathData="M5,8c0,-1.65 1.35,-3 3,-3h2V3H8C5.24,3 3,5.24 3,8v2h2V8z"/>

</vector>

go/quickstep/res/drawable/ic_translate.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ 
        android:viewportHeight="24"

        android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@color/overview_button"

      android:fillColor="@android:color/white"

      android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>

</vector>

go/quickstep/res/layout/overview_actions_container.xml

+7 −5
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    <LinearLayout

        android:id="@+id/action_buttons"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|center_horizontal"

        android:layout_height="@dimen/overview_actions_height"

        android:layout_gravity="top|center_horizontal"

        android:orientation="horizontal">



        <Space
@@ -104,11 +104,13 @@ 
        </LinearLayout>



        <!-- Unused. Included only for compatibility with parent class. -->

        <ImageButton

        <Button

            android:id="@+id/action_split"

            style="@style/GoOverviewActionButton"

            android:src="@drawable/ic_split_vertical"

            android:contentDescription="@string/action_split"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:drawableStart="@drawable/ic_split_vertical"

            android:text="@string/action_split"

            android:theme="@style/ThemeControlHighlightWorkspaceColor"

            android:visibility="gone" />

go/quickstep/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <dimen name="go_overview_button_container_width">80dp</dimen>

    <dimen name="go_overview_button_container_margin">16dp</dimen>

    <dimen name="go_overview_button_caption_margin">8dp</dimen>

    <dimen name="overview_actions_size">96dp</dimen>

    <dimen name="overview_actions_height">96dp</dimen>

    <dimen name="overview_proactive_row_height">0dp</dimen>

    <dimen name="overview_proactive_row_bottom_margin">24dp</dimen>

    <dimen name="task_corner_radius_override">28dp</dimen>