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

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

Merge changes from topic "jr_device" into sc-dev 

* changes:
  Update NLS listing page
  Add device list to NLS pages
  Add icons to NLS mgmt page
parents 74d540f8 ddf1958b

res/drawable/ic_notification_silence.xml

+9 −24
Original line number Diff line number Diff line
@@ -14,28 +14,13 @@ Copyright (C) 2019 The Android Open Source Project 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/back">

        <shape android:shape="oval">

            <solid

                android:color="@color/notification_silence_color" />

            <size

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

            android:width="24dp"

            android:height="24dp"

                android:width="24dp"/>

        </shape>

    </item>

    <item

        android:id="@+id/fore"

        android:gravity="center">

        <vector

            android:width="13dp"

            android:height="13dp"

            android:viewportWidth="24"

            android:viewportHeight="24">

            android:viewportHeight="24"

            android:tint="?android:attr/colorControlNormal">

    <path

                android:fillColor="#FFFFFFFF"

                android:pathData="M15,14.5c-1.38,0 -2.5,-1.12 -2.5,-2.5c0,-0.28 -0.22,-0.5 -0.5,-0.5s-0.5,0.22 -0.5,0.5c0,1.38 -1.12,2.5 -2.5,2.5S6.5,13.38 6.5,12c0,-0.28 -0.22,-0.5 -0.5,-0.5c-0.24,0 -0.46,0.18 -0.49,0.42C5.41,12.55 4.89,13 4.27,13H2v-2h1.71C4.1,10.11 5,9.5 6,9.5c1.38,0 2.5,1.12 2.5,2.5c0,0.28 0.22,0.5 0.5,0.5s0.5,-0.22 0.5,-0.5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5c0,0.28 0.22,0.5 0.5,0.5s0.5,-0.22 0.5,-0.5c0,-1.38 1.12,-2.5 2.5,-2.5c1.02,0 1.91,0.6 2.29,1.5H22v2h-2.27c-0.62,0 -1.14,-0.45 -1.23,-1.08c-0.04,-0.24 -0.25,-0.42 -0.49,-0.42c-0.28,0 -0.5,0.22 -0.5,0.5C17.5,13.38 16.38,14.5 15,14.5z"/>

        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM16,16L2.81,2.81 1.39,4.22l4.85,4.85C6.09,9.68 6,10.33 6,11v6L4,17v2h12.17l3.61,3.61 1.41,-1.41L16,16zM8,17l0.01,-6.16L14.17,17L8,17zM12,6.5c2.49,0 4,2.02 4,4.5v2.17l2,2L18,11c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.78,0.18 -1.45,0.52 -2.04,0.95L9.93,7.1c0.58,-0.37 1.27,-0.6 2.07,-0.6z"

        android:fillColor="@android:color/white"/>

</vector>
 
    </item>

</layer-list>

res/drawable/ic_ongoing_notification.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

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

  -->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12,18h0.17l-1.09,-1.09 1.41,-1.41L16,19l-3.5,3.5 -1.41,-1.41L12.17,20L12,20c-2.05,0 -4.09,-0.78 -5.66,-2.34 -3.12,-3.12 -3.12,-8.19 0,-11.31l1.41,1.41c-2.34,2.34 -2.34,6.15 0,8.49C8.89,17.38 10.4,18 12,18zM17.66,6.34c3.12,3.12 3.12,8.19 0,11.31l-1.41,-1.41c2.34,-2.34 2.34,-6.15 0,-8.49C15.11,6.62 13.6,6 12,6h-0.17l1.09,1.09L11.5,8.5 8,5l3.5,-3.5 1.41,1.41L11.83,4L12,4c2.05,0 4.09,0.78 5.66,2.34z"/>

</vector>

res/xml/notification_access_permission_details.xml

+8 −4
Original line number Diff line number Diff line
@@ -34,19 +34,23 @@ 
    <CheckBoxPreference

        android:key="type_filter_ongoing"

        android:title="@string/notif_type_ongoing"

        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.OngoingTypeFilterPreferenceController"/>/>

        android:icon="@drawable/ic_ongoing_notification"

        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.OngoingTypeFilterPreferenceController"/>

    <CheckBoxPreference

        android:key="type_filter_conversation"

        android:title="@string/notif_type_conversation"

        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.ConversationTypeFilterPreferenceController"/>/>

        android:icon="@drawable/ic_promote_conversation"

        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.ConversationTypeFilterPreferenceController"/>

    <CheckBoxPreference

        android:key="type_filter_alerting"

        android:title="@string/notif_type_alerting"

        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.AlertingTypeFilterPreferenceController"/>/>

        android:icon="@drawable/ic_notification_alert"

        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.AlertingTypeFilterPreferenceController"/>

    <CheckBoxPreference

        android:key="type_filter_silent"

        android:title="@string/notif_type_silent"

        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.SilentTypeFilterPreferenceController"/>/>

        android:icon="@drawable/ic_notification_silence"

        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.SilentTypeFilterPreferenceController"/>



    <Preference

        android:key="bridged_apps"

res/xml/notification_access_settings.xml

+10 −1
Original line number Diff line number Diff line
@@ -21,4 +21,13 @@ 
    android:key="notification_access_screen"

    android:title="@string/manage_notification_access_title"

    settings:searchable="false"

    settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessScreenPreferenceController" />
 
    settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessScreenPreferenceController">



    <PreferenceCategory

        android:key="allowed"

        android:title="@string/app_permission_summary_allowed"/>



    <PreferenceCategory

        android:key="not_allowed"

        android:title="@string/app_permission_summary_not_allowed"/>

</PreferenceScreen>

src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java

+30 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.applications.specialaccess.notificationaccess;



import android.companion.ICompanionDeviceManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;
@@ -30,8 +32,10 @@ import com.android.settings.R; 
import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.notification.NotificationBackend;

import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.applications.AppUtils;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.widget.LayoutPreference;
@@ -43,6 +47,10 @@ public class HeaderPreferenceController extends BasePreferenceController 
    private PackageInfo mPackageInfo;

    private PackageManager mPm;

    private CharSequence mServiceName;

    private ICompanionDeviceManager mCdm;

    private LocalBluetoothManager mBm;

    private ComponentName mCn;

    private int mUserId;



    public HeaderPreferenceController(Context context, String key) {

        super(context, key);
@@ -68,6 +76,26 @@ public class HeaderPreferenceController extends BasePreferenceController 
        return this;

    }



    public HeaderPreferenceController setCdm(ICompanionDeviceManager cdm) {

        mCdm = cdm;

        return this;

    }



    public HeaderPreferenceController setBluetoothManager(LocalBluetoothManager bm) {

        mBm = bm;

        return this;

    }



    public HeaderPreferenceController setCn(ComponentName cn) {

        mCn = cn;

        return this;

    }



    public HeaderPreferenceController setUserId(int userId) {

        mUserId = userId;

        return this;

    }



    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;
@@ -88,6 +116,8 @@ public class HeaderPreferenceController extends BasePreferenceController 
                        .getBadgedIcon(mPackageInfo.applicationInfo))

                .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))

                .setSummary(mServiceName)

                .setSecondSummary(new NotificationBackend().getDeviceList(

                        mCdm, mBm, mCn.getPackageName(), mUserId))

                .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))

                .setPackageName(mPackageInfo.packageName)

                .setUid(mPackageInfo.applicationInfo.uid)