Chris Wren
fa8889a88c
am da6a4904
: Merge "annoint new constants" into mnc-dev
...
* commit 'da6a4904a9b6370b9a4ceeab6f8ecc08738a2c7b':
annoint new constants
2015-06-10 14:54:38 +00:00
Jason Monk
5365a8fd3a
am caec03f9
: Remove periods from ignore optimizations summaries
...
* commit 'caec03f9e51469776242908b4d877d7248c52875':
Remove periods from ignore optimizations summaries
2015-06-10 14:54:09 +00:00
Jason Monk
5b23db3ce6
am cc0f3b75
: Merge "Advanced apps updates (2/2)" into mnc-dev
...
* commit 'cc0f3b75b2692c7b57b2e839b18d224ed51f8082':
Advanced apps updates (2/2)
2015-06-10 14:54:08 +00:00
Jason Monk
6c6a212f03
am 6f9b6e08
: Merge "Add sd card string, just in case" into mnc-dev
...
* commit '6f9b6e08a80b1d1e114808d1ac42e132888df185':
Add sd card string, just in case
2015-06-10 14:54:07 +00:00
Neil Fuller
54786a6adf
am c28330ec
: Merge "Modifications for changes to SettingsLib" into mnc-dev
...
* commit 'c28330ec3e6e808427cc17fd4060c3c0a7fa3462':
Modifications for changes to SettingsLib
2015-06-10 14:53:56 +00:00
Chris Wren
da6a4904a9
Merge "annoint new constants" into mnc-dev
2015-06-10 14:14:45 +00:00
Jason Monk
caec03f9e5
Remove periods from ignore optimizations summaries
...
Bug: 21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c
2015-06-10 09:04:14 -04:00
Jason Monk
cc0f3b75b2
Merge "Advanced apps updates (2/2)" into mnc-dev
2015-06-10 12:59:33 +00:00
Jason Monk
6f9b6e08a8
Merge "Add sd card string, just in case" into mnc-dev
2015-06-10 12:59:30 +00:00
Neil Fuller
c28330ec3e
Merge "Modifications for changes to SettingsLib" into mnc-dev
2015-06-10 12:23:49 +00:00
Fyodor Kupolov
af27f96bc6
am 8e2c4787
: Merge "Guest option should not be shown for the guest user" into mnc-dev
...
* commit '8e2c47870188c0732a1130b505748f07b23fa66c':
Guest option should not be shown for the guest user
2015-06-09 23:06:14 +00:00
Fyodor Kupolov
8e2c478701
Merge "Guest option should not be shown for the guest user" into mnc-dev
2015-06-09 22:57:27 +00:00
Fyodor Kupolov
c478885d8d
Guest option should not be shown for the guest user
...
Bug: 21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
2015-06-09 15:55:01 -07:00
Casper Bonde
b94840712e
am e278a208
: SAP: Make it possible to enforce a 16-digit pin code (5/5)
...
* commit 'e278a208bc8298963080dfb5352acedc65aad083':
SAP: Make it possible to enforce a 16-digit pin code (5/5)
2015-06-09 21:56:56 +00:00
Casper Bonde
e278a208bc
SAP: Make it possible to enforce a 16-digit pin code (5/5)
...
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.
This is needed for the SIM access profile.
Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea
Signed-off-by: Casper Bonde <c.bonde@samsung.com >
2015-06-09 21:42:15 +00:00
Paul Lawrence
cb3063ddda
am 2114e386
: Merge "Move CryptKeeper to own process" into mnc-dev
...
* commit '2114e386a4fabe060784a7077eaee9e13ef3af59':
Move CryptKeeper to own process
2015-06-09 21:12:35 +00:00
Paul Lawrence
2114e386a4
Merge "Move CryptKeeper to own process" into mnc-dev
2015-06-09 21:00:21 +00:00
Jason Monk
0087749f66
am 51f7c067
: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
...
* commit '51f7c067aac2d9326ff0569027d0dff2aa67f538':
Top level: "Storage" -> "Storage & USB"
2015-06-09 20:40:10 +00:00
Jason Monk
51f7c067aa
Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
2015-06-09 20:30:35 +00:00
Jason Monk
4da8e84432
Add sd card string, just in case
...
Bug: 21471429
Change-Id: Iac3cd1643b8aa3a62a0c97c8046cb365dfeaf527
2015-06-09 16:26:07 -04:00
Jason Monk
8987128dfa
am 4ab327b0
: Merge "Accounts -> Account sync" into mnc-dev
...
* commit '4ab327b05fe36d2841a89e3d9ba34d7df4027a91':
Accounts -> Account sync
2015-06-09 20:04:36 +00:00
Jason Monk
3ab21b90a7
am fed12068
: Merge "Bring back gear icon for advanced app settings" into mnc-dev
...
* commit 'fed12068e0068759870fe9ba9bdff08f76068c12':
Bring back gear icon for advanced app settings
2015-06-09 20:04:34 +00:00
Jason Monk
ba0e2c8688
Advanced apps updates (2/2)
...
Change the title of the screen, add a category to break things up
Bug: 21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25
2015-06-09 16:01:28 -04:00
Jason Monk
4ab327b05f
Merge "Accounts -> Account sync" into mnc-dev
2015-06-09 19:50:12 +00:00
Jason Monk
fed12068e0
Merge "Bring back gear icon for advanced app settings" into mnc-dev
2015-06-09 19:49:22 +00:00
Jason Monk
32ff4d9bc9
Bring back gear icon for advanced app settings
...
Bug: 21372377
Change-Id: Id7192d4f3f019d099b530a7acc6556054e92dfba
2015-06-09 15:45:17 -04:00
Jason Monk
4afe7429c7
am 86333477
: Add strings that will be used for new ignore opt ux
...
* commit '86333477b7913eccf628b7c0ac081fd7f0634b52':
Add strings that will be used for new ignore opt ux
2015-06-09 19:39:02 +00:00
Jason Monk
2b6c3c0f72
Top level: "Storage" -> "Storage & USB"
...
Bug: 21324048
Change-Id: I42853135e3a119b84b86a96968053d64313a4b92
2015-06-09 15:32:14 -04:00
Jason Monk
86333477b7
Add strings that will be used for new ignore opt ux
...
Bug: 21375688
Change-Id: Ifb01e2a1fe9a1d4ae55acafa046080740e8bc5dc
2015-06-09 15:24:05 -04:00
Jason Monk
43db745ea0
Accounts -> Account sync
...
Bug: 21726868
Change-Id: I806730a338f4320398766dfd32867656bced77fe
2015-06-09 14:46:57 -04:00
Chris Wren
ca689aeada
annoint new constants
...
Bug: 21114836
Change-Id: I63fb1da67a6f6d8dfad076e7e1c2cef0783c17f9
2015-06-09 14:24:03 -04:00
Tony Mantler
20296c9660
am 8c39a9c6
: Merge "Move ApplicationsState to SettingsLib" into mnc-dev
...
* commit '8c39a9c6f28f2b31635cae77d045b38fd3b7c2d9':
Move ApplicationsState to SettingsLib
2015-06-09 17:32:39 +00:00
Tony Mantler
8c39a9c6f2
Merge "Move ApplicationsState to SettingsLib" into mnc-dev
2015-06-09 17:20:25 +00:00
Sudheer Shanka
ec54778989
am b259b384
: Merge "Update some strings." into mnc-dev
...
* commit 'b259b3845739f6b66a77b0fb9a14069cb7ff9122':
Update some strings.
2015-06-09 16:35:22 +00:00
Sudheer Shanka
b259b38457
Merge "Update some strings." into mnc-dev
2015-06-09 16:24:14 +00:00
Chris Wren
455b27eee0
am c7581e81
: instrument display rotation settings
...
* commit 'c7581e8126cefcbac599e95db664dd675c95ef18':
instrument display rotation settings
2015-06-09 16:23:32 +00:00
Chris Wren
5d66e17002
am 18213459
: don\'t double set the dropdown value
...
* commit '182134595b9ba63607afceca9c77d62a6ac74066':
don't double set the dropdown value
2015-06-09 16:23:31 +00:00
Chris Wren
c7581e8126
instrument display rotation settings
...
Bug: 21530764
Change-Id: Iee36addb7cf3cb6abbbf1ac90727e0fce22121cb
2015-06-09 12:10:15 -04:00
Chris Wren
182134595b
don't double set the dropdown value
...
idion: set the default value, and then add a callback
actual: spinner posts the change to a handler: so it posts after the callback is set.
This makes it hard to count actual user interactions without counting the initialization.
Bug: 21530764
Change-Id: I3ff8319edb374d8d7c10982512054f303c69a5ec
2015-06-09 12:09:44 -04:00
Sudheer Shanka
566678a013
Update some strings.
...
Bug: 20518822
Change-Id: I871a45fe66bd3a3524adcf907c3253c3275d9745
2015-06-09 14:29:26 +01:00
Jim Miller
6b176ce80d
am fa47bc02
: Update and cleanup FingerprintManager API to new spec
...
* commit 'fa47bc02900d407e1a730039e94221c2efc160d0':
Update and cleanup FingerprintManager API to new spec
2015-06-09 12:49:16 +00:00
Neil Fuller
b986442747
Modifications for changes to SettingsLib
...
See associated changes in frameworks/base for details.
Bug: 19058953
Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2132
Change-Id: Ic3393df28dd63ca75b203d1d0430d69cab7c40de
2015-06-09 10:10:56 +01:00
Jim Miller
fa47bc0290
Update and cleanup FingerprintManager API to new spec
...
Fixes bug 21040383
Change-Id: Ic2b279ffad47d31a6ad3beed7b3af5ad0a61e815
2015-06-08 17:17:44 -07:00
Tony Mantler
67cd6ab93a
Move ApplicationsState to SettingsLib
...
Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings
b/21328967
Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e
2015-06-08 14:41:02 -07:00
John Spurlock
1b76e79047
am 9a583610
: Merge "Settings: Update notification listener user prompt strings." into mnc-dev
...
* commit '9a5836107664b796c3ae37c25c89cbf070243edb':
Settings: Update notification listener user prompt strings.
2015-06-08 21:12:23 +00:00
John Spurlock
9a58361076
Merge "Settings: Update notification listener user prompt strings." into mnc-dev
2015-06-08 21:04:19 +00:00
John Spurlock
90e27a4893
Settings: Update notification listener user prompt strings.
...
Bug: 20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
2015-06-08 16:50:36 -04:00
Jorim Jaggi
89246fd560
am 7e38eea8
: Merge "Fix settings overdraw" into mnc-dev
...
* commit '7e38eea8170249ca13c54748d6ba4c615528cad6':
Fix settings overdraw
2015-06-08 18:49:06 +00:00
Jorim Jaggi
7e38eea817
Merge "Fix settings overdraw" into mnc-dev
2015-06-08 18:39:25 +00:00
Alex Klyubin
ddd4d07438
am abe74683
: Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
...
* commit 'abe74683c13f05cc7143c7d4073fcf9a5a829f43':
Switch from KeyStore.saw to KeyStore.list.
2015-06-08 18:22:37 +00:00