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

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

Version 2 of Ongoing Privacy Dialog 

Minor changes to colors and layout of chip.

Redesign of dialog using new mocks.

Dialog launches Permission Hub

Test: visual & atest PrivacyDialogBuilderTest
Fixes: 117646163
Bug: 112331475

Change-Id: Ic8008f05fcb139c2581794abbb47c00819c20d7f
parent 22edbb5e

packages/SystemUI/res/drawable/privacy_chip_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
-->



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

    <solid android:color="#bbbbbb" />

    <solid android:color="#4a4a4a" />

    <padding android:padding="@dimen/ongoing_appops_chip_bg_padding" />

    <corners android:radius="@dimen/ongoing_appops_chip_bg_corner_radius" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/ongoing_privacy_chip.xml

+12 −4
Original line number Diff line number Diff line
@@ -18,11 +18,14 @@ 
<com.android.systemui.privacy.OngoingPrivacyChip

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

    android:id="@+id/privacy_chip"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:layout_margin="@dimen/ongoing_appops_chip_margin"

    android:layout_width="wrap_content"

    android:layout_marginLeft="@dimen/ongoing_appops_chip_margin"

    android:layout_marginRight="@dimen/ongoing_appops_chip_margin"

    android:layout_marginTop="@dimen/ongoing_appops_top_chip_margin"

    android:layout_marginBottom="@dimen/ongoing_appops_top_chip_margin"

    android:gravity="center_vertical|center_horizontal"

    android:layout_gravity="center_vertical|end"

    android:layout_gravity="center_vertical|start"

    android:orientation="horizontal"

    android:paddingStart="@dimen/ongoing_appops_chip_side_padding"

    android:paddingEnd="@dimen/ongoing_appops_chip_side_padding"
@@ -38,12 +41,17 @@ 
            />



        <TextView

            android:id="@+id/app_name"

            android:id="@+id/text_container"

            android:layout_height="match_parent"

            android:layout_width="wrap_content"

            android:singleLine="true"

            android:ellipsize="end"

            android:lines="1"

            android:layout_gravity="center_vertical|end"

            android:gravity="center_vertical"

            android:textAppearance="@style/TextAppearance.StatusBar.Clock"

            android:textColor="@color/status_bar_clock_color"

            android:layout_marginStart="@dimen/ongoing_appops_chip_icon_margin"

            android:layout_marginEnd="@dimen/ongoing_appops_chip_icon_margin"

        />

</com.android.systemui.privacy.OngoingPrivacyChip>
 
 No newline at end of file

packages/SystemUI/res/layout/ongoing_privacy_dialog_content.xml

+14 −6
Original line number Diff line number Diff line
@@ -29,22 +29,30 @@ 
        android:orientation="vertical"

        android:padding="@dimen/ongoing_appops_dialog_content_padding">



        <LinearLayout

            android:id="@+id/icons_container"

        <TextView

            android:id="@+id/title"

            android:layout_width="match_parent"

            android:layout_height="@dimen/ongoing_appops_dialog_icon_height"

            android:orientation="horizontal"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:importantForAccessibility="no"

            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"

        />



        <LinearLayout

            android:id="@+id/text_container"

            android:id="@+id/items_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:gravity="start"

        />



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

                 android:visibility="gone" />



    </LinearLayout>



</ScrollView>
 
 No newline at end of file

packages/SystemUI/res/layout/ongoing_privacy_dialog_item.xml

0 → 100644
+53 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:fillViewport="true"

    android:orientation="horizontal"

    android:layout_marginTop="@dimen/ongoing_appops_dialog_text_margin"

    android:focusable="true" >



    <ImageView

        android:id="@+id/app_icon"

        android:layout_height="@dimen/ongoing_appops_dialog_icon_height"

        android:layout_width="@dimen/ongoing_appops_dialog_icon_height"

    />



    <TextView

        android:id="@+id/app_name"

        android:layout_height="@dimen/ongoing_appops_dialog_icon_height"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:gravity="bottom|start"

        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"



    />



    <LinearLayout

        android:id="@+id/icons"

        android:layout_height="@dimen/ongoing_appops_dialog_icon_height"

        android:layout_width="wrap_content"

        android:gravity="end"

        android:visibility="gone"

    />

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml

+3 −2
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
        android:id="@+id/battery"

        android:layout_height="match_parent"

        android:layout_width="wrap_content"

        android:gravity="center_vertical|end" />

        android:gravity="center_vertical|end"

        android:layout_gravity="center_vertical|end" />

    </LinearLayout>

</LinearLayout>