PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace placeholder icons with stylus icons" into udc-dev

Browse Source
This commit is contained in:
Vania Januar
2023-05-05 09:50:11 +00:00
committed by Android (Google) Code Review
parent 7c042f374b fb7c1766a8
commit 072d8b90d0
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
res/drawable/ic_stylus.xml Normal file
View File

@@ -0,0 +1,26 @@
<!--
~ Copyright (C) 2023 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="960"
android:viewportHeight="960"
android:tint="?android:attr/colorControlNormal">
<path android:fillColor="@android:color/white"
android:pathData="M167,840Q146,845 130.5,829.5Q115,814 120,793L160,602L358,800L167,840ZM358,800L160,602L618,144Q641,121 675,121Q709,121 732,144L816,228Q839,251 839,285Q839,319 816,342L358,800ZM675,200L261,614L346,699L760,285Q760,285 760,285Q760,285 760,285L675,200Q675,200 675,200Q675,200 675,200Z"/>
</vector>

3
src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java
View File

@@ -165,8 +165,7 @@ public class StylusDeviceUpdater implements InputManager.InputDeviceListener,
}
mUsiPreference.setKey(PREF_KEY);
mUsiPreference.setTitle(R.string.stylus_connected_devices_title);
// TODO(b/250909304): pending actual icon visD
mUsiPreference.setIcon(R.drawable.ic_edit);
mUsiPreference.setIcon(R.drawable.ic_stylus);
mUsiPreference.setOnPreferenceClickListener((Preference p) -> {
mMetricsFeatureProvider.logClickedPreference(p, mFragment.getMetricsCategory());
launchDeviceDetails();

3
src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderController.java
View File

@@ -70,8 +70,7 @@ public class StylusUsiHeaderController extends BasePreferenceController implemen
ImageView iconView = mHeaderPreference.findViewById(R.id.entity_header_icon);
if (iconView != null) {
// TODO(b/250909304): get proper icon once VisD ready
iconView.setImageResource(R.drawable.ic_edit);
iconView.setImageResource(R.drawable.ic_stylus);
iconView.setContentDescription("Icon for stylus");
}
refresh();