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

Commit 91234a34 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Redlines adjustments" into rvc-dev am: a9eec3d8 am: 17bbe727 am:... 

Merge "Redlines adjustments" into rvc-dev am: a9eec3d8 am: 17bbe727 am: e60503da am: 4425c261

Change-Id: I4c1656f0c1b18b60be38c7ba6a2514f9921affaa
parents 5cd9ac8a 4425c261

packages/SystemUI/res/layout/controls_app_item.xml

+8 −21
Original line number Original line Diff line number Diff line
@@ -16,33 +16,25 @@ 
<FrameLayout

<FrameLayout

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

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

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="64dp"

    android:background="?android:attr/selectableItemBackground">

    android:background="?android:attr/selectableItemBackground">





    <LinearLayout

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="match_parent"

        android:layout_gravity="start|top"

        android:layout_gravity="start|top"

        android:gravity="center_vertical"

        android:gravity="center_vertical">

        android:minHeight="?android:attr/listPreferredItemHeightSmall"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:layout_marginBottom="@dimen/controls_app_bottom_margin">





        <FrameLayout

        <FrameLayout

            android:id="@+id/icon_frame"

            android:id="@+id/icon_frame"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="match_parent"

            android:gravity="start|center_vertical"

            android:minWidth="56dp"

            android:orientation="horizontal"

            android:orientation="horizontal"

            android:paddingTop="@dimen/controls_app_icon_frame_top_padding"

            android:paddingEnd="@dimen/controls_app_icon_frame_side_padding">

            android:paddingBottom="@dimen/controls_app_icon_frame_top_padding"

            android:paddingEnd="@dimen/controls_app_icon_frame_side_padding"

            android:paddingStart="@dimen/controls_app_icon_frame_side_padding" >





            <ImageView

            <ImageView

                android:id="@android:id/icon"

                android:id="@android:id/icon"

                android:layout_gravity="start|center_vertical"

                android:layout_width="@dimen/controls_app_icon_size"

                android:layout_width="@dimen/controls_app_icon_size"

                android:layout_height="@dimen/controls_app_icon_size" />

                android:layout_height="@dimen/controls_app_icon_size" />

        </FrameLayout>

        </FrameLayout>
@@ -51,9 +43,7 @@ 
            android:layout_width="0dp"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_weight="1"

            android:orientation="vertical"

            android:orientation="vertical">

            android:paddingTop="@dimen/controls_app_text_padding"

            android:paddingBottom="@dimen/controls_app_text_padding">





            <TextView

            <TextView

                android:id="@android:id/title"

                android:id="@android:id/title"
@@ -62,8 +52,7 @@ 
                android:ellipsize="end"

                android:ellipsize="end"

                android:fadingEdge="horizontal"

                android:fadingEdge="horizontal"

                android:singleLine="true"

                android:singleLine="true"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textAppearance="@style/TextAppearance.Control.Management.Subtitle"/>

                android:textColor="?android:attr/textColorPrimary"/>





            <TextView

            <TextView

                android:id="@+id/favorites"

                android:id="@+id/favorites"
@@ -81,7 +70,5 @@ 
        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="@dimen/controls_app_divider_height"

        android:layout_height="@dimen/controls_app_divider_height"

        android:layout_gravity="center_horizontal|bottom"

        android:layout_gravity="center_horizontal|bottom"

        android:layout_marginStart="@dimen/controls_app_divider_side_margin"

        android:layout_marginEnd="@dimen/controls_app_divider_side_margin"

        android:background="?android:attr/listDivider" />

        android:background="?android:attr/listDivider" />

</FrameLayout>
 
</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/controls_base_item.xml

+5 −5
Original line number Original line Diff line number Diff line
@@ -98,15 +98,15 @@ 
    <CheckBox

    <CheckBox

        android:id="@+id/favorite"

        android:id="@+id/favorite"

        android:visibility="invisible"

        android:visibility="invisible"

        android:layout_width="wrap_content"

        android:layout_width="@dimen/controls_management_checkbox_size"

        android:layout_height="wrap_content"

        android:layout_height="@dimen/controls_management_checkbox_size"

        android:layout_gravity="bottom|end"

        android:minHeight="0dp"

        android:minWidth="0dp"

        android:gravity="center"

        android:background="@android:color/transparent"

        android:background="@android:color/transparent"

        android:clickable="false"

        android:clickable="false"

        android:selectable="false"

        android:selectable="false"

        android:importantForAccessibility="no"

        android:importantForAccessibility="no"

        android:layout_marginTop="4dp"

        android:layout_marginStart="4dp"

        app:layout_constraintStart_toEndOf="@id/subtitle"

        app:layout_constraintStart_toEndOf="@id/subtitle"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"/>

        app:layout_constraintBottom_toBottomOf="parent"/>

packages/SystemUI/res/layout/controls_horizontal_divider_with_empty.xml

+3 −9
Original line number Original line Diff line number Diff line
@@ -22,23 +22,17 @@ 
>

>





    <View

    <View

        android:layout_width="match_parent"

        android:layout_height="@dimen/controls_management_list_margin"

        />



    <FrameLayout

        android:id="@+id/frame"

        android:id="@+id/frame"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="@dimen/control_height"

        android:layout_height="@dimen/control_height"

        android:visibility="gone"

        android:visibility="gone"

    >

    >

    </FrameLayout>

    </View>

    <View

    <View

        android:id="@+id/divider"

        android:id="@+id/divider"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:layout_height="1dp"

        android:layout_marginBottom="10dp"

        android:layout_marginBottom="@dimen/controls_management_editing_divider_margin"

        android:layout_marginStart="40dp"

        android:layout_marginTop="@dimen/controls_management_editing_divider_margin"

        android:layout_marginEnd="40dp"

        android:background="#4dffffff" />

        android:background="#4dffffff" />

</LinearLayout>
 
</LinearLayout>

packages/SystemUI/res/layout/controls_management.xml

+4 −7
Original line number Original line Diff line number Diff line
@@ -31,18 +31,15 @@ 
        android:id="@+id/title"

        android:id="@+id/title"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceLarge"

        android:textAppearance="@style/TextAppearance.Control.Management.Title"

        android:textSize="@dimen/controls_title_size"

        android:textAlignment="center" />

        android:textAlignment="center" />









    <TextView

    <TextView

        android:id="@+id/subtitle"

        android:id="@+id/subtitle"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/controls_management_titles_margin"

        android:layout_marginTop="@dimen/controls_management_titles_margin"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textAppearance="@style/TextAppearance.Control.Management.Subtitle"

        android:textAlignment="center" />

        android:textAlignment="center" />





    <ViewStub

    <ViewStub
@@ -53,7 +50,7 @@ 




    <FrameLayout

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="64dp">

        android:layout_height="72dp">





        <View

        <View

            android:layout_width="match_parent"

            android:layout_width="match_parent"
@@ -64,7 +61,7 @@ 
        <androidx.constraintlayout.widget.ConstraintLayout

        <androidx.constraintlayout.widget.ConstraintLayout

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:padding="4dp">

            android:padding="@dimen/controls_management_footer_side_margin">





            <Button

            <Button

                android:id="@+id/other_apps"

                android:id="@+id/other_apps"

packages/SystemUI/res/layout/controls_management_apps.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ 
    android:id="@+id/list"

    android:id="@+id/list"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:layout_marginTop="@dimen/controls_management_list_margin"

    android:layout_marginTop="@dimen/controls_management_apps_list_margin"

    android:layout_marginStart="@dimen/controls_management_apps_extra_side_margin"

    android:layout_marginEnd="@dimen/controls_management_apps_extra_side_margin"

/>

/>