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

Commit 882116ee authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Add back privacy chip 

This adds back the privacy chip classes (Controller and view).

Change to using Executors and DeviceConfigProxy, also fix tests that
were flaky before.

Test: SystemUITests
Test: enabled hub and see chip appear (after re-opening QS)
Bug: 160966908
Change-Id: Id3e5981a87c33a8cabe7ce348f9512d81ad2b1d8
parent 1241c870

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+7 −0
Original line number Diff line number Diff line
@@ -120,6 +120,13 @@ public final class SystemUiDeviceConfigFlags { 
     */

    public static final String HASH_SALT_MAX_DAYS = "hash_salt_max_days";



    // Flag related to Privacy Indicators



    /**

     * Whether the Permissions Hub is showing.

     */

    public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_2_enabled";



    // Flags related to Assistant



    /**

packages/CarSystemUI/res/values/dimens.xml

+15 −0
Original line number Diff line number Diff line
@@ -81,6 +81,21 @@ 
    <dimen name="car_keyline_2">96dp</dimen>

    <dimen name="car_keyline_3">128dp</dimen>



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

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

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

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

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

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

    <!-- Margins around the Ongoing App Ops chip. In landscape, the side margins are 0 -->

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

    <!-- Start and End padding for Ongoing App Ops chip -->

    <dimen name="ongoing_appops_chip_side_padding">6dp</dimen>

    <!-- Padding between background of Ongoing App Ops chip and content -->

    <dimen name="ongoing_appops_chip_bg_padding">4dp</dimen>

    <!-- Radius of Ongoing App Ops chip corners -->

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



    <!-- Car volume dimens. -->

    <dimen name="car_volume_item_icon_size">@dimen/car_primary_icon_size</dimen>

    <dimen name="car_volume_item_height">@*android:dimen/car_single_line_list_item_height</dimen>

packages/SystemUI/res/drawable/privacy_chip_bg.xml

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

<!--

     Copyright (C) 2020 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.

-->



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

    <solid android:color="#242424" /> <!-- 14% of white -->

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

        android:paddingBottom="@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

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

<!--

     Copyright (C) 2020 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.

-->





<com.android.systemui.privacy.OngoingPrivacyChip

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

    android:id="@+id/privacy_chip"

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:layout_gravity="center_vertical|end"

    android:focusable="true" >



        <FrameLayout

            android:id="@+id/background"

            android:layout_height="@dimen/ongoing_appops_chip_height"

            android:layout_width="wrap_content"

            android:minWidth="48dp"

            android:layout_gravity="center_vertical">

                <LinearLayout

                    android:id="@+id/icons_container"

                    android:layout_height="match_parent"

                    android:layout_width="wrap_content"

                    android:gravity="center_vertical"

                    />

          </FrameLayout>

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

packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml

+27 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
** See the License for the specific language governing permissions and

** limitations under the License.

-->

<FrameLayout

<LinearLayout

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

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

    android:id="@+id/quick_status_bar_system_icons"
@@ -27,6 +27,13 @@ 
    android:clickable="true"

    android:paddingTop="@dimen/status_bar_padding_top" >



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="horizontal"

        android:gravity="center_vertical|start" >



    <com.android.systemui.statusbar.policy.Clock

        android:id="@+id/clock"

        android:layout_width="wrap_content"
@@ -38,5 +45,23 @@ 
        android:singleLine="true"

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

        systemui:showDark="false" />

    </LinearLayout>



    <android.widget.Space

        android:id="@+id/space"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_gravity="center_vertical|center_horizontal"

        android:visibility="gone" />



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="horizontal"

        android:gravity="center_vertical|end" >



    <include layout="@layout/ongoing_privacy_chip" />



</FrameLayout>
 
    </LinearLayout>

</LinearLayout>