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

Commit 53ceaf67 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

DO NOT MERGE Revert "DO NOT MERGE Remove Privacy Indicators" 

This reverts commit ec3e0eca.

Reason for revert: Re-enable Privacy Indicators in qt-r1-dev
Bug: 133257910

Change-Id: I7c778dd76c0aff3f483cf06f1dd96fd067145c12
parent ec3e0eca

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

+7 −0
Original line number Diff line number Diff line
@@ -106,6 +106,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_enabled";



    // Flags related to Assistant Handles



    /**

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) 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.

-->



<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
+41 −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.

-->





<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:gravity="center_vertical"

    android:orientation="horizontal"

    android:focusable="true" >



        <FrameLayout

            android:id="@+id/background"

            android:layout_height="@dimen/ongoing_appops_chip_height"

            android:minWidth="48dp"

            android:layout_width="wrap_content" >

                <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/ongoing_privacy_text_item.xml

0 → 100644
+24 −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.

-->



<TextView

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:textDirection="locale"

    android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary"

/>
 
 No newline at end of file

packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml

+27 −0
Original line number Diff line number Diff line
@@ -22,11 +22,19 @@ 
    android:layout_height="@*android:dimen/quick_qs_offset_height"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:gravity="center"

    android:orientation="horizontal"

    android:clickable="true"

    android:paddingStart="@dimen/status_bar_padding_start"

    android:paddingEnd="@dimen/status_bar_padding_end" >



    <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"
@@ -39,3 +47,22 @@ 
        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" />



    </LinearLayout>

</LinearLayout>