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

Commit 4415394c authored by Sukesh Ram's avatar Sukesh Ram
Browse files

Update Window Header Text Font & Position 

Aligned the app name text, app icon, and expand icon positions to be consistent with window header spec. Set the app name text’s font to be “GM3/ Title / Small” (TextAppearance.Material.Title). Changed expand more icon’s drawable to be consistent with launcher’s (ic_expand_more.xml).

Since Header background color and icon colors are still being decided
upon, only the app name font and the app/text/icon alignment aspects of
the spec above are addressed in this CL.

Test: Manual
Bug: 298199770
Change-Id: I63fb223c39a754b3f67cc814a863152e484b3c7a
parent 99c86797

libs/WindowManager/Shell/res/drawable/ic_baseline_expand_more_24.xml

+10 −4
Original line number Diff line number Diff line
@@ -14,8 +14,14 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<vector android:height="24dp" android:tint="#000000"

    android:viewportHeight="24" android:viewportWidth="24"

    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="@android:color/black" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/textColorSecondary">

    <path

        android:fillColor="#FF000000"

        android:pathData="M5.41,7.59L4,9l8,8 8,-8 -1.41,-1.41L12,14.17"/>

</vector>

libs/WindowManager/Shell/res/layout/desktop_mode_app_controls_window_decor.xml

+9 −9
Original line number Diff line number Diff line
@@ -31,35 +31,35 @@ 
        android:orientation="horizontal"

        android:clickable="true"

        android:focusable="true"

        android:paddingStart="8dp">

        android:paddingStart="16dp">



        <ImageView

            android:id="@+id/application_icon"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_margin="4dp"

            android:layout_gravity="center_vertical"

            android:contentDescription="@string/app_icon_text" />



        <TextView

            android:id="@+id/application_name"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_height="20dp"

            android:minWidth="80dp"

            android:textColor="@color/desktop_mode_caption_app_name_dark"

            android:textAppearance="@android:style/TextAppearance.Material.Title"

            android:textSize="14sp"

            android:textFontWeight="500"

            android:gravity="center_vertical"

            android:lineHeight="20dp"

            android:layout_gravity="center_vertical"

            android:layout_weight="1"

            android:paddingStart="4dp"

            android:paddingEnd="4dp"

            android:paddingStart="8dp"

            android:paddingEnd="8dp"

            tools:text="Gmail"/>



        <ImageButton

            android:id="@+id/expand_menu_button"

            android:layout_width="32dp"

            android:layout_height="32dp"

            android:padding="4dp"

            android:layout_width="16dp"

            android:layout_height="16dp"

            android:contentDescription="@string/expand_menu_text"

            android:src="@drawable/ic_baseline_expand_more_24"

            android:tint="@color/desktop_mode_caption_expand_button_dark"