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

Commit 978ce92a authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Delete hollow pill flag"

parents 51cf6674 55b655c8
Loading
Loading
Loading
Loading
+0 −25
Original line number Diff line number Diff line
<!--
  ~ Copyright (C) 2018 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="28dp"
        android:height="10dp"
        android:viewportWidth="28"
        android:viewportHeight="10">
    <path
        android:pathData="M23,1H5C2.7909,1 1,2.7909 1,5C1,7.2091 2.7909,9 5,9H23C25.2091,9 27,7.2091 27,5C27,2.7909 25.2091,1 23,1ZM5,0C2.2386,0 0,2.2386 0,5C0,7.7614 2.2386,10 5,10H23C25.7614,10 28,7.7614 28,5C28,2.2386 25.7614,0 23,0H5Z"
        android:fillColor="?attr/wallpaperTextColor"
        android:fillType="evenOdd"/>
</vector>
+0 −12
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
    private static final int STATE_FACE_UNLOCK = 2;
    private static final int STATE_FINGERPRINT = 3;
    private static final int STATE_FINGERPRINT_ERROR = 4;
    private static final boolean HOLLOW_PILL = SystemProperties
            .getBoolean("persist.sysui.hollow_pill", false);

    private int mLastState = 0;
    private boolean mLastDeviceInteractive;
@@ -224,16 +222,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
                throw new IllegalArgumentException();
        }

        if (HOLLOW_PILL && deviceInteractive) {
            switch (state) {
                case STATE_FINGERPRINT:
                case STATE_LOCK_OPEN:
                case STATE_LOCKED:
                case STATE_FACE_UNLOCK:
                    iconRes = R.drawable.ic_home_button_outline;
            }
        }

        return mContext.getDrawable(iconRes);
    }