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
The Android Automerger
a6511e7541
merge in mnc-release history after reset to mnc-dev
2015-06-09 01:04:53 -07:00
Makoto Onuki
375c3a080e
Show list of permissions instead of just numbers
...
Bug 21615746
Change-Id: I23439b3571f10d6d396174025a19b5ebb585dee9
2015-06-08 17:48:46 -07: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
Alex Klyubin
abe74683c1
Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
2015-06-08 18:11:23 +00:00
Paul Lawrence
a1092fe1ad
Move CryptKeeper to own process
...
It is possible to run settings from within keyboard, and then find ways of
crashing it. This restarts CryptKeeper since they are one process, with
bad consequences (see bug).
Move to separate process to alleviate this problem
Bug: 21514179
Change-Id: Ib2c19e8f0f3956402cc11a2caedc0a45f786cac3
2015-06-08 11:00:50 -07:00
John Spurlock
7db1063958
am 178d46a9
: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
...
* commit '178d46a9b5cccfa5106028375877b2eb0bf005f7':
Settings: Update DND access dialog to new user flow.
2015-06-08 16:52:01 +00:00
Geoff Mendal
f53cc1d797
am 0053802f
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0053802f23cfad9116f05716d2d5f651c19159ae':
Import translations. DO NOT MERGE
2015-06-08 16:44:22 +00:00
Martijn Coenen
4504eb36be
am 1276b213
: Merge "Add NFC payment "how it works" screens." into mnc-dev
...
* commit '1276b21317d0f86bbd3f59b14d9c0c745cecfa56':
Add NFC payment "how it works" screens.
2015-06-08 16:42:41 +00:00
Martijn Coenen
dcf324c0b3
am 63f7fc88
: Merge "NFC: don\'t use dynamic resources." into mnc-dev
...
* commit '63f7fc8847afe5029cabe5f07cc9e3ffce9f65c9':
NFC: don't use dynamic resources.
2015-06-08 16:42:40 +00:00
John Spurlock
178d46a9b5
Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
2015-06-08 16:39:33 +00:00
Alex Klyubin
3848407d0c
Switch from KeyStore.saw to KeyStore.list.
...
KeyStore.saw was renamed to KeyStore.list for clarity. The
implementation of both methods is exactly the same.
Bug: 18088752
Change-Id: I2f171a4b7479683d5af898ebdf1b6f8a741536d1
2015-06-08 09:30:08 -07:00
John Spurlock
a00194d998
Settings: Update DND access dialog to new user flow.
...
- Only list apps in the DND access list that have included
the corresponding permission in their manifest.
- Show a scary user warning before enabling access per app.
- Update manifest to follow framework intent action rename.
Bug: 21621663
Change-Id: I76c6893928092bdbb58d62bc3aba31ec8a609fc6
2015-06-08 12:27:03 -04:00
Rubin Xu
d1ce82ae8b
Defensively load untrusted icons from account authenticator
...
Catch Resources.NotFoundException which should cover all parsing
errors from loadDrawables(); also substitute a default icon if
parsing returns null.
Bug: 17760671
Change-Id: Ia0ec25e34974ed85b6ffe6882d5bce003d64e9d6
2015-06-08 17:21:19 +01:00