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

Commit 2bafab79 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Update controls icon" into sc-v2-dev am: 648cc5e3 am: 2c6bd8db

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403235

Change-Id: I3ccb4b9ad79ba61137e9a79c2cb773edd8af53c5
parents 69b940d6 2c6bd8db
Loading
Loading
Loading
Loading
+25 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ 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"
    android:viewportHeight="24">
  <path
      android:fillColor="#FF000000"
      android:pathData="M12,3L4,9v12h16L20,9l-8,-6zM18,19h-3v-6L9,13v6L6,19v-9l6,-4.5 6,4.5v9z"/>
</vector>
+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@
        android:layout_gravity="bottom|start"
        android:scaleType="center"
        android:tint="?android:attr/textColorPrimary"
        android:src="@drawable/ic_device_light"
        android:src="@drawable/controls_icon"
        android:background="@drawable/keyguard_bottom_affordance_bg"
        android:layout_marginStart="@dimen/keyguard_affordance_horizontal_offset"
        android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"
+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class DeviceControlsTile @Inject constructor(

    private var hasControlsApps = AtomicBoolean(false)

    private val icon = ResourceIcon.get(R.drawable.ic_device_light)
    private val icon = ResourceIcon.get(R.drawable.controls_icon)

    private val listingCallback = object : ControlsListingController.ControlsListingCallback {
        override fun onServicesUpdated(serviceInfos: List<ControlsServiceInfo>) {