Maurice Lam d4621f6302 resolve merge conflicts of f36b25c2df to stage-aosp-master ...

Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80

2017-10-16 18:31:40 +00:00

..

choose_lock_pattern.xml

Update GLIF button styles

2017-02-21 18:24:39 -08:00

confirm_lock_password.xml

Use config_headlineFontFamily for password screens.

2017-07-06 14:30:28 -07:00

confirm_lock_pattern_internal.xml

Use GLIF theme for screen lock confirmation

2017-03-15 13:26:54 -07:00

confirm_lock_pattern.xml

Add background image for work challenge

2016-01-21 14:15:31 +00:00

crypt_keeper_progress.xml

Make Settings app aware of layout direction

2012-07-24 15:02:12 -07:00

fingerprint_enroll_enrolling.xml

Overlapping text over fingerprint animation

2017-07-07 12:10:45 -07:00

fingerprint_enroll_find_sensor.xml

resolve merge conflicts of f36b25c2df to stage-aosp-master

2017-10-16 18:31:40 +00:00

fingerprint_enroll_finish.xml

Add another fingerprint button not visible in landscape mode

2017-07-11 16:58:12 -07:00