Maurice Lam
95d1eb90d3
am cff4eb9b
: am ea0f0fdf
: am 7a335113
: am 9b6bd390
: am 32b96646
: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit 'cff4eb9b73182d6b68e0f91c4d08fc53bb2b91ec':
[ScreenLock] Style encryption interstitial in SUW
2015-07-23 20:26:15 +00:00
Maurice Lam
7e83103020
[ScreenLock] Style encryption interstitial in SUW
...
When running in setup wizard, style the encryption interstitial using
styles from Setup Wizard library, to be consistent with the rest of
the setup flow.
Bug: 22587892
Change-Id: I3787643139ec4189f16e0046875fe3a688c8060b
2015-07-20 21:06:21 -07:00
Maurice Lam
9a93dfa8cb
am d7615bba
: am ec2f7fe5
: am 135c8869
: am 8ebd1e2c
: am af57ec88
: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
...
* commit 'd7615bbaacf6c7dc4ae91e0921cfb2f5987c73bc':
[ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:37:06 +00:00
Maurice Lam
af57ec8831
Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
2015-07-21 00:22:03 +00:00
Makoto Onuki
b2121d9bdd
am 0968056b
: am f5ac0b6a
: am f9b46965
: am 75842ffc
: am 4dd637a0
: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
...
* commit '0968056bac9c4eb808792eb6ae0b387899924b89':
Fix ugly text wrapping on non-english locales
2015-07-21 00:14:03 +00:00
Maurice Lam
5cceb312fd
[ScreenLock] Change title for RedactionInterstitial
...
Change the title for RedactionInterstital to "Notifications".
Bug: 22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
2015-07-20 23:42:52 +00:00
Makoto Onuki
26cf58aba6
Fix ugly text wrapping on non-english locales
...
Bug 22284618
Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495
2015-07-16 15:45:09 -07:00
Sanket Padawe
423a891b38
am 45c5de2f
: am e07fce2c
: am 18c31082
: am c5be2243
: am 046decca
: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit '45c5de2f62bcdea70a5f25f60ab10398f5911574':
Use common xml file for multi-tab settings.
2015-07-16 06:02:20 +00:00
Sanket Padawe
046decca29
Merge "Use common xml file for multi-tab settings." into mnc-dev
2015-07-16 05:01:27 +00:00
Jason Monk
8dc988c811
am 6d2be9f2
: am a4dfe05b
: am 543d68cc
: am 194e92d3
: am 50972605
: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '6d2be9f2043bbd1fb7e5afc44583c7cc80a7b1a0':
Disable ignore battery optimization items that can't change
2015-07-16 00:04:45 +00:00
Maurice Lam
90cc69eeee
am 614cf892
: am 3603d8ad
: am 2ea2950d
: am 77352c65
: am 4595978b
: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '614cf892a6b8813461ff7e5619cb3bc062afcbf6':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 23:12:19 +00:00
Jason Monk
509726054a
Merge "Disable ignore battery optimization items that can't change" into mnc-dev
2015-07-15 22:48:13 +00:00
Maurice Lam
4595978b72
Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
2015-07-15 19:28:06 +00:00
Jason Monk
443513cc0d
Disable ignore battery optimization items that can't change
...
Bug: 22507803
Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
2015-07-15 15:22:38 -04:00
Maurice Lam
8d1f9c9be5
[Fingerprint] Add fingerprint enroll in setup wizard
...
Make a subclass for each enrolling screen that setup wizard uses, and
in override the corresponding get*Intent methods to always use the
setup wizard versions of the next screens.
On minor change made to the original flow is that it will now return
RESULT_OK if it is finished, as opposed to RESULT_CANCELED.
Bug: 21695577
Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
2015-07-15 11:14:22 -07:00
Selim Cinek
854d08be2b
Fixed the layout for the fingerprint renaming
...
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
(cherry picked from commit abd67de1ad
)
2015-07-15 17:37:46 +00:00
Martijn Coenen
0ebcd356cf
am 9670159d
: am f5f40191
: am bafffd14
: am 35738049
: am 8d9bb1ae
: Merge "Fix up Tap and Pay how it works." into mnc-dev
...
* commit '9670159d46a16a2151ff6f1ca737babf4c7685b0':
Fix up Tap and Pay how it works.
2015-07-14 18:46:48 +00:00
Sanket Padawe
c06f9b6721
Use common xml file for multi-tab settings.
...
Bug: 22360525
Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
2015-07-14 11:13:43 -07:00
Jason Monk
615cf7a27e
am eda414e5
: am ec786ebd
: am 381b1758
: am 5250cc00
: am 53dd1d4d
: Merge "Fix app icon size" into mnc-dev
...
* commit 'eda414e5bd488674fb6ee679b4e7a7c6544173fc':
Fix app icon size
2015-07-14 16:42:08 +00:00
Martijn Coenen
35738049df
am 8d9bb1ae
: Merge "Fix up Tap and Pay how it works." into mnc-dev
...
* commit '8d9bb1ae1d551699ba85061001ced90a157ae9ad':
Fix up Tap and Pay how it works.
2015-07-14 07:57:35 +00:00
Martijn Coenen
8d9bb1ae1d
Merge "Fix up Tap and Pay how it works." into mnc-dev
2015-07-14 07:45:01 +00:00
Jason Monk
5250cc0007
am 53dd1d4d
: Merge "Fix app icon size" into mnc-dev
...
* commit '53dd1d4deea9968f1255018248ff0393252032dd':
Fix app icon size
2015-07-13 23:01:59 +00:00
Jason Monk
061c8af3d6
Fix app icon size
...
Bug: 22425103
Change-Id: I35b3476eb75d221e5f244702534d4475b2c5921e
2015-07-13 12:18:43 -04:00
Rubin Xu
46175909ed
am 6e2c1c2e
: am bd2e045e
: am a383b02c
: am 8b9a9519
: am 331b9823
: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit '6e2c1c2e68f6ff40c7201550446e29c8411154b7':
Remove unused MediaFormat activity
2015-07-10 19:47:04 +00:00
Rubin Xu
8b9a9519c8
am 331b9823
: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit '331b9823d0a686d414f181ed406181d1d4e2aa1a':
Remove unused MediaFormat activity
2015-07-10 19:03:19 +00:00
Rubin Xu
331b9823d0
Merge "Remove unused MediaFormat activity" into mnc-dev
2015-07-10 18:47:51 +00:00
Martijn Coenen
91dcad4089
Fix up Tap and Pay how it works.
...
Also, don't use HCE service description.
Bug: 21988684
Bug: 21657963
Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
2015-07-10 15:43:25 +02:00
Rubin Xu
af43d4ddb4
Remove unused MediaFormat activity
...
As part of cleanup of ExternalStorageFormatter.
Bug: 9433509
Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
2015-07-09 21:29:11 +01:00
Julia Reynolds
8abecf1bb9
am e124fabb
: am e10b32ba
: am 1bde3259
: am df778e8e
: am 963e3fdd
: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit 'e124fabbf3a17791d59e76723d7a466a1a7bd756':
Talkback improvements for Settings screens.
2015-07-09 20:10:05 +00:00
Julia Reynolds
df778e8e76
am 963e3fdd
: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit '963e3fdd05156bb11e6692222b2d08b34c7d126b':
Talkback improvements for Settings screens.
2015-07-09 19:09:25 +00:00
Julia Reynolds
963e3fdd05
Merge "Talkback improvements for Settings screens." into mnc-dev
2015-07-09 18:57:24 +00:00
Julia Reynolds
ce25af4838
Talkback improvements for Settings screens.
...
Bug: 21164141
Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
2015-07-09 13:21:20 -04:00
Selim Cinek
05df42cd98
am 8c3c8814
: am 31e554ac
: am babeeacb
: am aab3a4c8
: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
...
* commit '8c3c8814f5e826c87f1db777c1bad71616a1c4a8':
Fixed the layout for the fingerprint renaming
2015-07-09 00:07:45 +00:00
Selim Cinek
aab3a4c847
Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
2015-07-08 23:09:52 +00:00
Selim Cinek
abd67de1ad
Fixed the layout for the fingerprint renaming
...
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
2015-07-08 15:47:56 -07:00
Sanket Padawe
5418ef080b
am d49fbb37
: am 012876e4
: am beb277de
: am a63ee14f
: am c7777b94
: Merge "Locale based string changes in BT." into mnc-dev
...
* commit 'd49fbb372a504b1644b8880da59108a3816f6f36':
Locale based string changes in BT.
2015-07-08 21:37:52 +00:00
Sanket Padawe
c7777b9470
Merge "Locale based string changes in BT." into mnc-dev
2015-07-08 17:15:57 +00:00
Sanket Padawe
aa165e0a50
Locale based string changes in BT.
...
Bug: 22219203
Change-Id: Ic920621baf769032475da32ea425097aafa0922e
2015-07-07 12:13:08 -07:00
Jeff Sharkey
d17921337d
am b126a4ea
: am 084dd048
: am fc963764
: am bdb64bf1
: am 7616b00b
: Merge changes from topic \'mig\' into mnc-dev
...
* commit 'b126a4ea4abffecd9580b1c56cde22f58e7f742d':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
2015-07-07 00:31:43 +00:00
Jeff Sharkey
48751c1a51
Fix some ordering, colors, and accessibility bugs.
...
When adding preferences to public/private details screens, always
add in-order when rebuilding. Hacky fix for broken summary text and
eject image color tints.
Fix crash when device rotated during partitioning. Set correct
accessibility titles in all wizard steps.
Bug: 22098044, 21376962
Change-Id: I68aff96cba497a91919cad8865722bc9cef7eaa7
2015-07-05 22:10:13 -07:00
Daichi Hirono
c22816362c
Show bar graphs for internal storage items (Apps, images, video etc.).
...
BUG=21898434
Change-Id: I8285088c7bef82bbd63fa38d6a95180079acd195
2015-07-02 17:54:29 +09:00
Jason Monk
d79984c9e4
Remove char limit from owner info
...
Bug: 21959734
Change-Id: I21854309ca390cb126ba50feaa56fb9a35b862e1
2015-06-29 15:42:41 -04:00
Daichi Hirono
fdc72d907c
Merge "Update storage wizard's assets." into mnc-dev
2015-06-25 04:45:10 +00:00
Daichi Hirono
b7edd7b852
Update storage wizard's assets.
...
BUG=22049781
Change-Id: Ie7eae9c76db06c77d0f4e85941125c005c2f28eb
2015-06-25 13:16:18 +09:00
Jason Monk
1cbbec00ab
Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev
2015-06-24 19:04:28 +00:00
Jason Monk
b01459997e
Fix marquee on app snippet in InstalledAppDetails
...
First need to fix layout of the app_item as the widget was running
over the end of the view, do this by switching to a RelativeLayout.
Then select the view so it can actually marquee.
Bug: 22043942
Change-Id: Ieb94649ccf3dc8dcf56014c02fcdc06da71a9a62
2015-06-24 14:53:57 -04:00
Daichi Hirono
95029c9701
Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev
2015-06-24 05:22:03 +00:00
Daichi Hirono
c8463895a8
Change the color of format button in "Device storage > Format" screen.
...
BUG=21898857
Change-Id: Ic1619482f5294b6f2d1e14154bab25103ec3b630
2015-06-24 14:17:06 +09:00
Selim Cinek
1726b2c94d
Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev
2015-06-23 21:50:27 +00:00
Selim Cinek
cf8347b33f
Added contentDescription for fingerprint on the confirmCredential screen
...
Bug: 21850269
Change-Id: Ia3720451a74e69e119b60121d7906274c522f70a
2015-06-23 17:48:48 -04:00