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

Commit 1f1a2740 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'lockscreen_themes'

* changes:
  Change keyguard theme when wallpaper colors change
  Themeable keyguard clock
  Use theme color on transient text
  Keyguard icon colors matching light or dark theme
parents 19208a54 987f1937
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -195,6 +195,9 @@
    <!-- to access instant apps -->
    <uses-permission android:name="android.permission.ACCESS_INSTANT_APPS" />

    <!-- to change themes - light or dark -->
    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES" />

    <application
        android:name=".SystemUIApplication"
        android:persistent="true"
+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ Copyright (C) 2014 The Android Open Source Project
    android:viewportHeight="24.0">

    <path
        android:fillColor="@color/clock_gray"
        android:fillColor="?attr/bgProtectSecondaryTextColor"
        android:pathData="M22.0,5.7l-4.6,-3.9l-1.3,1.5l4.6,3.9L22.0,5.7zM7.9,3.4L6.6,1.9L2.0,5.7l1.3,1.5L7.9,3.4zM12.5,8.0L11.0,8.0l0.0,6.0l4.7,2.9l0.8,-1.2l-4.0,-2.4L12.5,8.0zM12.0,4.0c-5.0,0.0 -9.0,4.0 -9.0,9.0c0.0,5.0 4.0,9.0 9.0,9.0s9.0,-4.0 9.0,-9.0C21.0,8.0 17.0,4.0 12.0,4.0zM12.0,20.0c-3.9,0.0 -7.0,-3.1 -7.0,-7.0c0.0,-3.9 3.1,-7.0 7.0,-7.0c3.9,0.0 7.0,3.1 7.0,7.0C19.0,16.9 15.9,20.0 12.0,20.0z"/>
</vector>
+20 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2017 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
  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="@color/pin_divider_color" />
</shape>
 No newline at end of file
+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@
             android:textStyle="normal"
             android:inputType="textPassword"
             android:textSize="16sp"
             android:textColor="?attr/bgProtectTextColor"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:imeOptions="flagForceAscii|actionDone"
             android:maxLength="500"
@@ -67,6 +68,7 @@
             android:contentDescription="@string/accessibility_ime_switch_button"
             android:clickable="true"
             android:padding="8dip"
             android:tint="@color/background_protected"
             android:layout_gravity="end|center_vertical"
             android:background="?android:attr/selectableItemBackground"
             android:visibility="gone"
+5 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@
                    android:layout_centerHorizontal="true"
                    android:layout_marginRight="72dp"
                    androidprv:scaledTextSize="28"
                    android:textColor="?attr/bgProtectTextColor"
                    android:contentDescription="@string/keyguard_accessibility_pin_area"
                    />
            <ImageButton
@@ -65,19 +66,20 @@
                    android:clickable="true"
                    android:paddingTop="8dip"
                    android:paddingBottom="8dip"
                    android:paddingRight="8dp"
                    android:paddingRight="0dp"
                    android:paddingLeft="24dp"
                    android:background="@drawable/ripple_drawable"
                    android:contentDescription="@string/keyboardview_keycode_delete"
                    android:layout_alignEnd="@+id/pinEntry"
                    android:layout_alignParentRight="true"
                    android:tint="@color/pin_delete_color"
                    />
            <View
                    android:id="@+id/divider"
                    android:layout_width="match_parent"
                    android:layout_height="1dp"
                    android:layout_alignParentBottom="true"
                    android:background="#28FFFFFF"
                    android:background="@drawable/pin_divider"
                    />
        </com.android.keyguard.AlphaOptimizedRelativeLayout>
        <LinearLayout
@@ -203,6 +205,7 @@
                    android:layout_weight="1"
                    android:paddingBottom="11sp"
                    android:src="@drawable/ic_done_wht"
                    style="@style/Keyguard.ImageButton.NumPadEnter"
                    android:background="@drawable/ripple_drawable"
                    android:contentDescription="@string/keyboardview_keycode_enter"
                    />
Loading