Julia Reynolds
cf92ef10a5
Updates to automatic rule listing page for 3P rules.
...
Show the provider app icon and name; allow deletion from
listing page; remove the rule summary for consistency.
Bug: 22977552
Change-Id: Ib71832fa4ff64b7321ade39f9964ac52cee6c643
2015-09-21 11:30:02 -04:00
Justin Harrison
c591cdd69b
am fa9d8258
: am 8a44f2c4
: am a3add1d2
: am c6a96d40
: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'fa9d8258d4d186c1aeaf3f79cff892d0a290e6a5':
Add color transform setting
2015-09-19 18:14:36 +00:00
Jason Monk
0217281d33
Add color transform setting
...
Bug: 24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
2015-09-18 20:11:01 -04:00
Paul Lawrence
e68e93fc36
am 67d0fe4c
: am fe9b6d3e
: am aead1b25
: am 43be4b9b
: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit '67d0fe4c0ec169514c05ec485834fca353ebc9d2':
Stop long passwords crashing CryptKeeper
2015-09-18 15:57:21 +00:00
Paul Lawrence
44985b9ccd
Stop long passwords crashing CryptKeeper
...
Bug: 24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
2015-09-16 15:29:57 -07:00
Maurice Lam
7d8ebeea94
[ScreenLockSetup] Create separate title string
...
Create a separate "Choose screen lock" title for setup wizard's
version of ChooseLockGeneric, with a higher CHAR LIMIT because
setup wizard's layout has more space and can avoid using
abbreviations.
Bug: 23551150
Change-Id: I93aa8c537ac97e7a1af9414a5b3ddc218c929bff
2015-09-10 12:05:14 -07:00
Robin Lee
b5e37f1d45
Merge "Show installed user keys in Security Settings"
2015-09-08 16:03:26 +00:00
Robin Lee
baefdcf9eb
Show installed user keys in Security Settings
...
This makes removing a particular keyset possible without deleting the
whole keystore along with it.
Bug: 22541933
Change-Id: I248803cb27efdd1695438dfc82951887dc579f99
2015-08-26 16:22:19 +01:00
Julia Reynolds
ab60fe2a14
Use a button style that visibly shows when the button is disabled.
...
Bug: 21199007
Change-Id: I5bcfa4cfcc7b39eaadae8b8af4c13591f497fee8
2015-08-14 09:55:37 -04:00
Maurice Lam
bb26847ba4
am 305c4335
: am d2174636
: am 4797364d
: am a430ac56
: am 3d9cb926
: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
...
* commit '305c4335512f9a9c42b0925e8b23b869348c3d95':
[Fingerprint] Use different ring size for setup
2015-08-11 23:39:44 +00:00
Maurice Lam
a430ac56b2
am 3d9cb926
: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
...
* commit '3d9cb9261849d8178ce834c8216fe2154db4e5af':
[Fingerprint] Use different ring size for setup
2015-08-11 22:43:35 +00:00
Maurice Lam
d62aabf10d
[Fingerprint] Use different ring size for setup
...
Follow-up on ag/741340, to split the size of the fingerprint ring
during setup vs in settings. The ring in settings is slightly bigger
because the header is smaller and the error text will not be cropped.
Bug: 22924280
Change-Id: I4b9a817c85a3683924a01e41552ca80c85423f29
2015-08-07 10:48:48 -07:00
Jason Monk
5d402d59bc
am 9390333c
: am d2af0859
: am 661d1b77
: am 2e3775b9
: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit '9390333c84c6218cf70d0750c3f351ff208005f6':
Update USB dialog for USB-C power option
2015-08-04 18:23:57 +00:00
Jason Monk
83290eef8c
Update USB dialog for USB-C power option
...
Also includes a bit of visual updates, options now have summaries
as well.
Code has been refactored a bit, and is more flexible to easily
support any kind of power/data flow combination once its time
to support that.
Currently devices don't have USB-C ports, they can be simulated
with the following commands:
$ adb shell dumpsys usb add-port "matrix" dual
# ?s control whether these can be changed
$ adb shell dumpsys usb connect-port "matrix" ufp? sink? device?
# Do testing here
$ adb shell dumpsys usb disconnect-port "matrix"
$ adb shell dumpsys usb remove-port "matrix"
$ adb shell dumpsys usb reset
# Use the help for more info
$ adb shell dumpsys usb -h
Bug: 21615151
Change-Id: I53ad4de51ff10a197c87bf2741756c1821ee9e74
2015-08-04 09:18:57 -04:00
Prem Kumar
cba797450c
am 881207b0
: am a2ef9256
: am 21adfeeb
: am b0d10e79
: am eed361bb
: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit '881207b035a47fe5c698b4a99e28325ffa787f74':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:33:19 +00:00
Maurice Lam
24628cbfeb
am ce08d4d3
: am 36d6d2ff
: am 4c55266b
: am 0d6e1da5
: am 87fadbe6
: [Fingerprint] Help text for backup screen lock
...
* commit 'ce08d4d30811e251a2437f13ecb6bdfc00e179c4':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:33:18 +00:00
Prem Kumar
eed361bbaf
Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
2015-08-04 00:41:47 +00:00
Maurice Lam
87fadbe6d9
[Fingerprint] Help text for backup screen lock
...
Show a help text saying "Choose your backup screen lock method" when
asking the user for backup screen lock during fingerprint enrollment.
A backup translation is specified, using the source string "Set up your
backup screen lock method".
Bug: 22879473
Change-Id: I9b9348141227103e695d1fc78601745cac0309a7
2015-08-03 23:12:09 +00:00
Sanket Padawe
a7a4a5a2cf
Allow Contact sharing by default while connecting Car Kit.
...
Bug: 22556703
Change-Id: I335115bd1f6a2b043fb2ac8eeb1f9512b542e030
2015-07-31 17:22:45 -07:00
Maurice Lam
0ae9cfcff8
am 824bcec9
: am 0d1f08cb
: am e2d4c5e8
: am 09840984
: am 997bcaa7
: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '824bcec98d86a406bb90ca031e359d392f9f6ba9':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 01:15:16 +00:00
Maurice Lam
5656314aca
[Fingerprint] Advertise wake & unlock during SUW
...
Adds a string to advertise to the user that wake & unlock is
available on all fingerprint devices.
Bug: 22644642
Change-Id: I9e44174c6ab088a06f95ae5c377c8ccec13a4257
2015-07-30 17:02:26 -07:00
Jorim Jaggi
d14ffb55c6
am 6922122e
: am a67487ee
: am 831e3f66
: am 7abb5164
: am 5458688c
: Merge "Make fingerprint error text a live region" into mnc-dev
...
* commit '6922122eb549bdda5382fbcd709cad6be0d012f7':
Make fingerprint error text a live region
2015-07-28 21:38:19 +00:00
Jorim Jaggi
0378c2e55d
am 91f4d549
: am f97f7416
: am 4d0b9669
: am f6bdf532
: am 74af384c
: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
...
* commit '91f4d5490d0f9aa86015c565250b2f8d9e2d608b':
Adjust enrollment UI for sw400 devices
2015-07-28 21:38:17 +00:00
Jorim Jaggi
5458688c1a
Merge "Make fingerprint error text a live region" into mnc-dev
2015-07-28 19:51:03 +00:00
Jorim Jaggi
74af384cae
Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
2015-07-28 19:50:47 +00:00
Selim Cinek
078d21c7da
am 36b77bc3
: am 6b73c0c6
: am d1c8a612
: am 34877c40
: am 596ce9ba
: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
...
* commit '36b77bc35d9c7598c3204165964a063f245cf2fa':
Autocapitalizing the fingerprint names now
2015-07-28 03:47:20 +00:00
Selim Cinek
c439427f70
am 1efc5c78
: am a415d016
: am d54849ed
: am ba887301
: am a8c7c8c8
: Merge "Added content description for the fingerprint icon" into mnc-dev
...
* commit '1efc5c7829542640574cdf3228a4c24b75ed41a4':
Added content description for the fingerprint icon
2015-07-28 03:47:19 +00:00
Jorim Jaggi
ba435f0ce0
Make fingerprint error text a live region
...
Bug: 22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d
2015-07-27 18:00:04 -07:00
Jorim Jaggi
9b456e5f9d
Adjust enrollment UI for sw400 devices
...
Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b
2015-07-27 17:31:58 -07:00
Selim Cinek
596ce9bab7
Merge "Autocapitalizing the fingerprint names now" into mnc-dev
2015-07-27 20:58:01 +00:00
Selim Cinek
a8c7c8c891
Merge "Added content description for the fingerprint icon" into mnc-dev
2015-07-27 20:57:45 +00:00
Jason Monk
936734f5c1
am 74129926
: am ebefd240
: am f0b615de
: am b322fdf5
: am 08cb3983
: Merge "Update battery optimization strings" into mnc-dev
...
* commit '7412992651fa92ffe68dc4f76f4c7fdc17021614':
Update battery optimization strings
2015-07-27 19:01:39 +00:00
Jason Monk
c9eba1f253
Update battery optimization strings
...
Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
2015-07-27 12:29:25 -04:00
Selim Cinek
01de6ef30a
Autocapitalizing the fingerprint names now
...
Bug: 22412062
Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86
2015-07-24 16:50:16 -07:00
Selim Cinek
21574cdb37
Added content description for the fingerprint icon
...
Bug: 22616421
Change-Id: I58b12ae656b81e02f66aafef3d86eef1ade1e804
2015-07-24 16:30:22 -07:00
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