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

Commit dd349767 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "privacy_chip_master" 

* changes:
  Restricts notified app ops based on flags
  Add back privacy chip
parents 558dd8eb fe4b8c26

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



    /**

data/etc/com.android.systemui.xml

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>

        <permission name="android.permission.OBSERVE_NETWORK_POLICY"/>

        <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" />

        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>

        <permission name="android.permission.PACKAGE_USAGE_STATS" />

        <permission name="android.permission.READ_DREAM_STATE"/>

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

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ 


    <!-- Listen app op changes -->

    <uses-permission android:name="android.permission.WATCH_APPOPS" />

    <uses-permission android:name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" />



    <!-- to read and change hvac values in a car -->

    <uses-permission android:name="android.car.permission.CONTROL_CAR_CLIMATE" />

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