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

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

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

parents 7c042f37 fb7c1766
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
<!--
  ~ 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>
 No newline at end of file
+1 −2
Original line number Diff line number Diff line
@@ -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();
+1 −2
Original line number Diff line number Diff line
@@ -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();