Commit Graph

20774 Commits

Author SHA1 Message Date
Paul Lawrence
0060fb1a14 am cb3063dd: am 2114e386: Merge "Move CryptKeeper to own process" into mnc-dev
* commit 'cb3063ddda573d297b769b3134d1ebb673863393':
  Move CryptKeeper to own process
2015-06-09 21:26:11 +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
a59d4b9cd1 am 0087749f: am 51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
* commit '0087749f66d299f1687475f56f340cf9cc42ef51':
  Top level: "Storage" -> "Storage & USB"
2015-06-09 20:59:19 +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
40aba9d87c am 8987128d: am 4ab327b0: Merge "Accounts -> Account sync" into mnc-dev
* commit '8987128dfa186685ac6a4f73993eea68a20da014':
  Accounts -> Account sync
2015-06-09 20:16:11 +00:00
Jason Monk
2ad9a3ab7d am 3ab21b90: am fed12068: Merge "Bring back gear icon for advanced app settings" into mnc-dev
* commit '3ab21b90a7835da0ff6add47cff5edccbfcdbe93':
  Bring back gear icon for advanced app settings
2015-06-09 20:16:10 +00: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
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
60142e6230 am 4afe7429: am 86333477: Add strings that will be used for new ignore opt ux
* commit '4afe7429c7c15e2e5d6d657e02855148346244ba':
  Add strings that will be used for new ignore opt ux
2015-06-09 19:49:20 +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
Tony Mantler
d1e9671f57 am 20296c96: am 8c39a9c6: Merge "Move ApplicationsState to SettingsLib" into mnc-dev
* commit '20296c966023a1fc3ae5b08950fc6a36becd8bf1':
  Move ApplicationsState to SettingsLib
2015-06-09 17:46:51 +00: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
33696a7e83 am ec547789: am b259b384: Merge "Update some strings." into mnc-dev
* commit 'ec54778989fa3f04c97770477b4db4728e474324':
  Update some strings.
2015-06-09 17:02:49 +00:00
Chris Wren
49203c0bd2 am 455b27ee: am c7581e81: instrument display rotation settings
* commit '455b27eee06ff6577453936e531186caca000d56':
  instrument display rotation settings
2015-06-09 16:44:16 +00:00
Chris Wren
0daeb1374b am 5d66e170: am 18213459: don\'t double set the dropdown value
* commit '5d66e17002053fe759c47cb5aae26f70e677e248':
  don't double set the dropdown value
2015-06-09 16:44:15 +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
0f90a53f39 am 6b176ce8: am fa47bc02: Update and cleanup FingerprintManager API to new spec
* commit '6b176ce80d95efcd3058d463a26fce870e146466':
  Update and cleanup FingerprintManager API to new spec
2015-06-09 13:01:35 +00: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
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
541e5c410c am 1b76e790: am 9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev
* commit '1b76e7904744a4cde25af73ff9b378d3a765c640':
  Settings: Update notification listener user prompt strings.
2015-06-08 21:28:59 +00: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
412a5d15e5 am 89246fd5: am 7e38eea8: Merge "Fix settings overdraw" into mnc-dev
* commit '89246fd560d1c1f2209c00c1618e5ec6ac432ce1':
  Fix settings overdraw
2015-06-08 19:02:37 +00: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
ae86002ad9 am ddd4d074: am abe74683: Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
* commit 'ddd4d074380d51d3ca5c83cd1067efa95a2855e3':
  Switch from KeyStore.saw to KeyStore.list.
2015-06-08 18:38:14 +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
Neil Fuller
50024b644b am 7779ef1a: (-s ours) Merge "Revert "Stop showing long names for local timezones when it is ambiguous""
* commit '7779ef1a48e1115aa719c65c3809702f19dca5df':
  Revert "Stop showing long names for local timezones when it is ambiguous"
2015-06-08 17:43:23 +00:00
Neil Fuller
7779ef1a48 Merge "Revert "Stop showing long names for local timezones when it is ambiguous"" 2015-06-08 17:13:43 +00:00
Neil Fuller
eb26cd884f Revert "Stop showing long names for local timezones when it is ambiguous"
This reverts commit cc4d2c22d4.

Change-Id: I04773f3dd0f2d5756e6901185fe24b5310c5041e
2015-06-08 17:09:45 +00:00
John Spurlock
2268450147 am 7db10639: am 178d46a9: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
* commit '7db1063958b8192237dec6ffa2de2092ccd0f486':
  Settings: Update DND access dialog to new user flow.
2015-06-08 17:04:17 +00:00