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

Commit 5df2107f authored by Vania Januar's avatar Vania Januar Committed by Android (Google) Code Review
Browse files

Merge "Replace circle icon on stylus settings to ic_edit."

parents 4550e939 2756e398
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ 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="24" android:viewportHeight="24" android:tint="?attr/colorControlNormal">
    <path android:fillColor="@android:color/white" android:pathData="M9,39H11.2L35.45,14.75L34.35,13.65L33.25,12.55L9,36.8ZM6,42V35.6L35.4,6.2Q36.25,5.35 37.525,5.375Q38.8,5.4 39.65,6.25L41.8,8.4Q42.65,9.25 42.65,10.5Q42.65,11.75 41.8,12.6L12.4,42ZM39.5,10.45 L37.45,8.4ZM35.45,14.75 L34.35,13.65 33.25,12.55 35.45,14.75Z"/>
</vector>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,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.circle);
        mUsiPreference.setIcon(R.drawable.ic_edit);
        mUsiPreference.setOnPreferenceClickListener((Preference p) -> {
            mMetricsFeatureProvider.logClickedPreference(p, mFragment.getMetricsCategory());
            launchDeviceDetails();
+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,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.circle);
            iconView.setImageResource(R.drawable.ic_edit);
            iconView.setContentDescription("Icon for stylus");
        }
        refresh();