Merge "Temporary color change to make lock pattern screen visible"
This commit is contained in:
committed by
Android (Google) Code Review
commit
6f3a760dad
@@ -85,7 +85,8 @@
|
|||||||
<!-- right side: lock pattern -->
|
<!-- right side: lock pattern -->
|
||||||
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" />
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/lock_pattern_background" />
|
||||||
|
|
||||||
|
|
||||||
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
|
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
|
||||||
|
@@ -59,7 +59,8 @@
|
|||||||
<!-- right side: lock pattern -->
|
<!-- right side: lock pattern -->
|
||||||
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" />
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/lock_pattern_background" />
|
||||||
|
|
||||||
|
|
||||||
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
|
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
|
||||||
|
@@ -46,6 +46,7 @@
|
|||||||
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
||||||
android:layout_width="354dip"
|
android:layout_width="354dip"
|
||||||
android:layout_height="354dip"
|
android:layout_height="354dip"
|
||||||
|
android:background="@color/lock_pattern_background"
|
||||||
aspect="square"/>
|
aspect="square"/>
|
||||||
|
|
||||||
<View
|
<View
|
||||||
|
@@ -52,6 +52,7 @@
|
|||||||
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
||||||
android:layout_width="354dip"
|
android:layout_width="354dip"
|
||||||
android:layout_height="354dip"
|
android:layout_height="354dip"
|
||||||
|
android:background="@color/lock_pattern_background"
|
||||||
aspect="square"/>
|
aspect="square"/>
|
||||||
|
|
||||||
<View
|
<View
|
||||||
|
@@ -51,6 +51,7 @@
|
|||||||
android:layout_width="354dip"
|
android:layout_width="354dip"
|
||||||
android:layout_height="354dip"
|
android:layout_height="354dip"
|
||||||
android:layout_marginTop="80dip"
|
android:layout_marginTop="80dip"
|
||||||
|
android:background="@color/lock_pattern_background"
|
||||||
aspect="square"/>
|
aspect="square"/>
|
||||||
|
|
||||||
<View
|
<View
|
||||||
|
@@ -49,6 +49,7 @@
|
|||||||
android:layout_width="354dip"
|
android:layout_width="354dip"
|
||||||
android:layout_height="354dip"
|
android:layout_height="354dip"
|
||||||
android:layout_marginTop="80dip"
|
android:layout_marginTop="80dip"
|
||||||
|
android:background="@color/lock_pattern_background"
|
||||||
aspect="square"/>
|
aspect="square"/>
|
||||||
|
|
||||||
<View
|
<View
|
||||||
|
@@ -41,7 +41,8 @@
|
|||||||
|
|
||||||
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" />
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/lock_pattern_background" />
|
||||||
|
|
||||||
<!-- bottom line looks bad when button bar is their too, omit in this case -->
|
<!-- bottom line looks bad when button bar is their too, omit in this case -->
|
||||||
<!--View
|
<!--View
|
||||||
|
@@ -34,7 +34,8 @@
|
|||||||
|
|
||||||
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" />
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/lock_pattern_background" />
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:background="@*android:drawable/code_lock_bottom"
|
android:background="@*android:drawable/code_lock_bottom"
|
||||||
|
@@ -46,6 +46,8 @@
|
|||||||
<color name="circle_avatar_frame_shadow_color">#80000000</color>
|
<color name="circle_avatar_frame_shadow_color">#80000000</color>
|
||||||
<color name="circle_avatar_frame_pressed_color">#ffffffff</color>
|
<color name="circle_avatar_frame_pressed_color">#ffffffff</color>
|
||||||
|
|
||||||
|
<color name="lock_pattern_background">#8000</color>
|
||||||
|
|
||||||
<color name="quantum_blue_grey_50">#ffeceff1</color>
|
<color name="quantum_blue_grey_50">#ffeceff1</color>
|
||||||
<color name="quantum_blue_grey_100">#ffcfd8dc</color>
|
<color name="quantum_blue_grey_100">#ffcfd8dc</color>
|
||||||
<color name="quantum_blue_grey_300">#ff90a4ae</color>
|
<color name="quantum_blue_grey_300">#ff90a4ae</color>
|
||||||
|
Reference in New Issue
Block a user