Merge "Remove icons for setting items in app & notification screen" into oc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
25b6ef1604
@@ -945,7 +945,6 @@
|
|||||||
|
|
||||||
<activity android:name="Settings$ManageApplicationsActivity"
|
<activity android:name="Settings$ManageApplicationsActivity"
|
||||||
android:label="@string/applications_settings"
|
android:label="@string/applications_settings"
|
||||||
android:icon="@drawable/ic_settings_applications"
|
|
||||||
android:taskAffinity="">
|
android:taskAffinity="">
|
||||||
<intent-filter android:priority="1">
|
<intent-filter android:priority="1">
|
||||||
<action android:name="android.settings.APPLICATION_SETTINGS" />
|
<action android:name="android.settings.APPLICATION_SETTINGS" />
|
||||||
@@ -2507,7 +2506,6 @@
|
|||||||
|
|
||||||
<activity android:name="Settings$ConfigureNotificationSettingsActivity"
|
<activity android:name="Settings$ConfigureNotificationSettingsActivity"
|
||||||
android:label="@string/configure_notification_settings"
|
android:label="@string/configure_notification_settings"
|
||||||
android:icon="@drawable/ic_settings_notifications"
|
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:taskAffinity="">
|
android:taskAffinity="">
|
||||||
<intent-filter android:priority="1">
|
<intent-filter android:priority="1">
|
||||||
@@ -2882,8 +2880,7 @@
|
|||||||
<activity android:name="Settings$AdvancedAppsActivity"
|
<activity android:name="Settings$AdvancedAppsActivity"
|
||||||
android:taskAffinity=""
|
android:taskAffinity=""
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:label="@string/app_default_dashboard_title"
|
android:label="@string/app_default_dashboard_title">
|
||||||
android:icon="@drawable/ic_adb">
|
|
||||||
<intent-filter android:priority="1">
|
<intent-filter android:priority="1">
|
||||||
<action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
|
<action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
|
||||||
<action android:name="android.settings.HOME_SETTINGS" />
|
<action android:name="android.settings.HOME_SETTINGS" />
|
||||||
|
@@ -1,25 +0,0 @@
|
|||||||
<!--
|
|
||||||
Copyright (C) 2017 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:pathData="M5,16c0,3.87 3.13,7 7,7s7,-3.13 7,-7v-4L5,12v4zM16.12,4.37l2.1,-2.1 -0.82,-0.83 -2.3,2.31C14.16,3.28 13.12,3 12,3s-2.16,0.28 -3.09,0.75L6.6,1.44l-0.82,0.83 2.1,2.1C6.14,5.64 5,7.68 5,10v1h14v-1c0,-2.32 -1.14,-4.36 -2.88,-5.63zM9,9c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM15,9c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"
|
|
||||||
android:fillColor="#FFFFFFFF"/>
|
|
||||||
</vector>
|
|
@@ -23,7 +23,6 @@
|
|||||||
<Preference
|
<Preference
|
||||||
android:key="manage_perms"
|
android:key="manage_perms"
|
||||||
android:title="@string/app_permissions"
|
android:title="@string/app_permissions"
|
||||||
android:icon="@drawable/ic_apps"
|
|
||||||
android:order="-130"
|
android:order="-130"
|
||||||
settings:keywords="@string/keywords_app_permissions">
|
settings:keywords="@string/keywords_app_permissions">
|
||||||
<intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
|
<intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
|
||||||
|
Reference in New Issue
Block a user