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
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
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
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
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
Geoff Mendal
faad75fbfd
am f53cc1d7
: (-s ours) am 0053802f
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f53cc1d7975295fa3a2fc584e5a051fbf659c948':
Import translations. DO NOT MERGE
2015-06-08 17:04:16 +00:00
Martijn Coenen
a048b2c76a
am 4504eb36
: am 1276b213
: Merge "Add NFC payment "how it works" screens." into mnc-dev
...
* commit '4504eb36be7932bbd3fe1c9e0759ef7231dbb70d':
Add NFC payment "how it works" screens.
2015-06-08 17:04:15 +00:00
Martijn Coenen
73f95c4389
am dcf324c0
: am 63f7fc88
: Merge "NFC: don\'t use dynamic resources." into mnc-dev
...
* commit 'dcf324c0b3917c8d9007a58bc35591c75793c422':
NFC: don't use dynamic resources.
2015-06-08 17:04:14 +00:00
Neil Fuller
df0028ec8a
am 91e20200
: (-s ours) Merge "Stop showing long names for local timezones when it is ambiguous"
...
* commit '91e20200c5532bf4117908223a08ff49666e1a6a':
Stop showing long names for local timezones when it is ambiguous
2015-06-08 16:59:00 +00: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
Geoff Mendal
0053802f23
Import translations. DO NOT MERGE
...
Change-Id: I0fb7a99f74e15a5bf9842cf30eedaa8443164bc5
Auto-generated-cl: translation import
2015-06-08 07:59:45 -07:00
Neil Fuller
91e20200c5
Merge "Stop showing long names for local timezones when it is ambiguous"
2015-06-08 09:36:20 +00:00
Martijn Coenen
1276b21317
Merge "Add NFC payment "how it works" screens." into mnc-dev
2015-06-08 08:02:30 +00:00
Martijn Coenen
63f7fc8847
Merge "NFC: don't use dynamic resources." into mnc-dev
2015-06-08 08:01:48 +00:00
Sanket Padawe
7e7376bf75
am ca324f5a
: am 547089c3
: Merge "Fix wifi network strings shown in Settings." into mnc-dev
...
* commit 'ca324f5abf12bab607c74c5aaa0c5e256c5dcefc':
Fix wifi network strings shown in Settings.
2015-06-06 02:21:16 +00:00