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

Commit bb68be0c authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Adjusted margins of Ongoing App Ops Dialog 

Margins adjusted according to updated mocks

Test: Visual (show layout bounds)
Fixes: 120027803
Change-Id: I052a5711f41087427833b1b6341e8d09b808a531
parent 9ebc59e9

packages/SystemUI/res/layout/ongoing_privacy_dialog_content.xml

+18 −12
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ 
        android:id="@+id/dialog_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:padding="@dimen/ongoing_appops_dialog_content_padding">



        android:orientation="vertical" >

        <TextView

            android:id="@+id/title"

            android:layout_width="match_parent"
@@ -37,11 +35,18 @@ 
            android:textDirection="locale"

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

            android:textColor="@*android:color/text_color_primary"

            android:paddingStart="@dimen/ongoing_appops_dialog_title_padding"

            android:paddingEnd="@dimen/ongoing_appops_dialog_title_padding"

            android:paddingBottom="@dimen/ongoing_appops_dialog_sep"

            android:layout_marginStart="@dimen/ongoing_appops_dialog_title_margin_sides"

            android:layout_marginEnd="@dimen/ongoing_appops_dialog_title_margin_sides"

            android:layout_marginBottom="@dimen/ongoing_appops_dialog_title_margin_top_bottom"

            android:layout_marginTop="@dimen/ongoing_appops_dialog_title_margin_top_bottom"

        />



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/ongoing_appops_dialog_items_bottom_margin" >



            <LinearLayout

                android:id="@+id/items_container"

                android:layout_width="match_parent"
@@ -52,6 +57,7 @@ 


            <include android:id="@+id/overflow" layout="@layout/ongoing_privacy_dialog_item"

                     android:visibility="gone" />

        </LinearLayout>



    </LinearLayout>

packages/SystemUI/res/layout/ongoing_privacy_dialog_item.xml

+13 −11
Original line number Diff line number Diff line
@@ -17,37 +17,39 @@ 


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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="@dimen/ongoing_appops_dialog_line_height"

    android:layout_marginStart="@dimen/ongoing_appops_dialog_text_padding"

    android:layout_marginEnd="@dimen/ongoing_appops_dialog_text_padding"

    android:fillViewport="true"

    android:orientation="horizontal"

    android:layout_marginTop="@dimen/ongoing_appops_dialog_text_margin"

    android:focusable="true" >

    android:focusable="true"

    android:layout_gravity="center_vertical">



    <ImageView

        android:id="@+id/app_icon"

        android:layout_height="@dimen/ongoing_appops_dialog_icon_height"

        android:layout_width="@dimen/ongoing_appops_dialog_icon_height"

        android:layout_height="@dimen/ongoing_appops_dialog_app_icon_size"

        android:layout_width="@dimen/ongoing_appops_dialog_app_icon_size"

        android:layout_gravity="start|center_vertical"

    />



    <TextView

        android:id="@+id/app_name"

        android:layout_height="@dimen/ongoing_appops_dialog_icon_height"

        android:layout_height="match_parent"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:gravity="bottom|start"

        android:gravity="start|center_vertical"

        android:textDirection="locale"

        android:textAppearance="@style/TextAppearance.AppOpsDialog.Item"

        android:textColor="@*android:color/text_color_primary"

        android:paddingStart="@dimen/ongoing_appops_dialog_text_padding"

        android:paddingEnd="@dimen/ongoing_appops_dialog_text_padding"



        android:layout_marginStart="@dimen/ongoing_appops_dialog_text_padding"

    />



    <LinearLayout

        android:id="@+id/icons"

        android:layout_height="@dimen/ongoing_appops_dialog_icon_height"

        android:layout_height="match_parent"

        android:layout_width="wrap_content"

        android:gravity="end"

        android:layout_gravity="end|center_vertical"

        android:visibility="gone"

    />

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -464,4 +464,6 @@ 
    <string-array name="config_pluginWhitelist" translatable="false">

        <item>com.android.systemui</item>

    </string-array>



    <integer name="ongoing_appops_dialog_max_apps">5</integer>

</resources>

packages/SystemUI/res/values/dimens.xml

+16 −10
Original line number Diff line number Diff line
@@ -945,14 +945,20 @@ 
    <dimen name="ongoing_appops_dialog_sep">16dp</dimen>

    <!--Padding around text items in Ongoing App Ops dialog -->

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

    <!-- Height of icons in Ongoing App Ops dialog. Both App Op icon and application icon -->

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

    <!-- Margin between text lines in Ongoing App Ops dialog -->

    <dimen name="ongoing_appops_dialog_text_margin">15dp</dimen>

    <!-- Side padding of title in Ongoing App Ops dialog -->

    <dimen name="ongoing_appops_dialog_title_padding">10dp</dimen>

    <!-- Padding around Ongoing App Ops dialog content -->

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

    <!-- Height and width of App Opp icons in Ongoing App Ops dialog -->

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

    <!-- Left margin of App Opp icons in Ongoing App Ops dialog -->

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

    <!-- Height and width of Application icons in Ongoing App Ops dialog -->

    <dimen name="ongoing_appops_dialog_app_icon_size">32dp</dimen>

    <!-- Height of line in Ongoing App Ops dialog-->

    <dimen name="ongoing_appops_dialog_line_height">48dp</dimen>

    <!-- Side margin of title in Ongoing App Ops dialog -->

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

    <!-- Bottom margin of items in Ongoing App Ops dialog -->

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

    <!-- Top and bottom margin of title in Ongoing App Ops dialog -->

    <dimen name="ongoing_appops_dialog_title_margin_top_bottom">18dp</dimen>

    <!-- Side margins around the Ongoing App Ops chip-->

    <dimen name="ongoing_appops_chip_margin">12dp</dimen>

    <!-- Top and bottom margins around the Ongoing App Ops chip -->
@@ -968,9 +974,9 @@ 
    <!-- Radius of Ongoing App Ops chip corners -->

    <dimen name="ongoing_appops_chip_bg_corner_radius">12dp</dimen>

    <!-- Text size for Ongoing App Ops dialog title -->

    <dimen name="ongoing_appops_dialog_title_size">24sp</dimen>

    <dimen name="ongoing_appops_dialog_title_size">20sp</dimen>

    <!-- Text size for Ongoing App Ops dialog items -->

    <dimen name="ongoing_appops_dialog_item_size">20sp</dimen>

    <dimen name="ongoing_appops_dialog_item_size">16sp</dimen>



    <!-- How much a bubble is elevated -->

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

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2292,6 +2292,6 @@ 
    <!-- Text for indicating extra apps using app ops [CHAR LIMIT=NONE] -->

    <plurals name="ongoing_privacy_dialog_overflow_text">

        <item quantity="one"><xliff:g id="num_apps" example="1">%d</xliff:g> other app</item>

        <item quantity="other"><xliff:g id="num_apps" example="3">%d</xliff:g> other app</item>

        <item quantity="other"><xliff:g id="num_apps" example="3">%d</xliff:g> other apps</item>

    </plurals>

</resources>