OSDN Git Service
Fyodor Kupolov [Tue, 9 Jun 2015 23:23:44 +0000 (23:23 +0000)]
am
af27f96b: am
8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev
* commit '
af27f96bc61ed23658696d440919b286ea4d747a':
Guest option should not be shown for the guest user
Fyodor Kupolov [Tue, 9 Jun 2015 23:06:14 +0000 (23:06 +0000)]
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
Fyodor Kupolov [Tue, 9 Jun 2015 22:57:26 +0000 (22:57 +0000)]
Merge "Guest option should not be shown for the guest user" into mnc-dev
Fyodor Kupolov [Tue, 9 Jun 2015 22:54:28 +0000 (15:54 -0700)]
Guest option should not be shown for the guest user
Bug:
21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
Casper Bonde [Tue, 9 Jun 2015 22:09:38 +0000 (22:09 +0000)]
am
b9484071: am
e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5)
* commit '
b94840712e9257e6f38446c7d7a3c4d3d79cf089':
SAP: Make it possible to enforce a 16-digit pin code (5/5)
Casper Bonde [Tue, 9 Jun 2015 21:56:56 +0000 (21:56 +0000)]
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)
Casper Bonde [Fri, 8 May 2015 13:19:03 +0000 (15:19 +0200)]
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>
Paul Lawrence [Tue, 9 Jun 2015 21:26:11 +0000 (21:26 +0000)]
am
cb3063dd: am
2114e386: Merge "Move CryptKeeper to own process" into mnc-dev
* commit '
cb3063ddda573d297b769b3134d1ebb673863393':
Move CryptKeeper to own process
Paul Lawrence [Tue, 9 Jun 2015 21:12:35 +0000 (21:12 +0000)]
am
2114e386: Merge "Move CryptKeeper to own process" into mnc-dev
* commit '
2114e386a4fabe060784a7077eaee9e13ef3af59':
Move CryptKeeper to own process
Paul Lawrence [Tue, 9 Jun 2015 20:56:24 +0000 (20:56 +0000)]
Merge "Move CryptKeeper to own process" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 20:59:19 +0000 (20:59 +0000)]
am
0087749f: am
51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
* commit '
0087749f66d299f1687475f56f340cf9cc42ef51':
Top level: "Storage" -> "Storage & USB"
Jason Monk [Tue, 9 Jun 2015 20:40:10 +0000 (20:40 +0000)]
am
51f7c067: Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
* commit '
51f7c067aac2d9326ff0569027d0dff2aa67f538':
Top level: "Storage" -> "Storage & USB"
Jason Monk [Tue, 9 Jun 2015 20:30:34 +0000 (20:30 +0000)]
Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 20:16:11 +0000 (20:16 +0000)]
am
8987128d: am
4ab327b0: Merge "Accounts -> Account sync" into mnc-dev
* commit '
8987128dfa186685ac6a4f73993eea68a20da014':
Accounts -> Account sync
Jason Monk [Tue, 9 Jun 2015 20:16:10 +0000 (20:16 +0000)]
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
Jason Monk [Tue, 9 Jun 2015 20:04:36 +0000 (20:04 +0000)]
am
4ab327b0: Merge "Accounts -> Account sync" into mnc-dev
* commit '
4ab327b05fe36d2841a89e3d9ba34d7df4027a91':
Accounts -> Account sync
Jason Monk [Tue, 9 Jun 2015 20:04:34 +0000 (20:04 +0000)]
am
fed12068: Merge "Bring back gear icon for advanced app settings" into mnc-dev
* commit '
fed12068e0068759870fe9ba9bdff08f76068c12':
Bring back gear icon for advanced app settings
Jason Monk [Tue, 9 Jun 2015 19:50:11 +0000 (19:50 +0000)]
Merge "Accounts -> Account sync" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 19:49:22 +0000 (19:49 +0000)]
Merge "Bring back gear icon for advanced app settings" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 19:49:20 +0000 (19:49 +0000)]
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
Jason Monk [Tue, 9 Jun 2015 19:45:17 +0000 (15:45 -0400)]
Bring back gear icon for advanced app settings
Bug:
21372377
Change-Id: Id7192d4f3f019d099b530a7acc6556054e92dfba
Jason Monk [Tue, 9 Jun 2015 19:39:02 +0000 (19:39 +0000)]
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
Jason Monk [Tue, 9 Jun 2015 19:32:14 +0000 (15:32 -0400)]
Top level: "Storage" -> "Storage & USB"
Bug:
21324048
Change-Id: I42853135e3a119b84b86a96968053d64313a4b92
Jason Monk [Tue, 9 Jun 2015 19:19:11 +0000 (15:19 -0400)]
Add strings that will be used for new ignore opt ux
Bug:
21375688
Change-Id: Ifb01e2a1fe9a1d4ae55acafa046080740e8bc5dc
Jason Monk [Tue, 9 Jun 2015 18:46:57 +0000 (14:46 -0400)]
Accounts -> Account sync
Bug:
21726868
Change-Id: I806730a338f4320398766dfd32867656bced77fe
Tony Mantler [Tue, 9 Jun 2015 17:46:51 +0000 (17:46 +0000)]
am
20296c96: am
8c39a9c6: Merge "Move ApplicationsState to SettingsLib" into mnc-dev
* commit '
20296c966023a1fc3ae5b08950fc6a36becd8bf1':
Move ApplicationsState to SettingsLib
Tony Mantler [Tue, 9 Jun 2015 17:32:39 +0000 (17:32 +0000)]
am
8c39a9c6: Merge "Move ApplicationsState to SettingsLib" into mnc-dev
* commit '
8c39a9c6f28f2b31635cae77d045b38fd3b7c2d9':
Move ApplicationsState to SettingsLib
Tony Mantler [Tue, 9 Jun 2015 17:20:16 +0000 (17:20 +0000)]
Merge "Move ApplicationsState to SettingsLib" into mnc-dev
Sudheer Shanka [Tue, 9 Jun 2015 17:02:49 +0000 (17:02 +0000)]
am
ec547789: am
b259b384: Merge "Update some strings." into mnc-dev
* commit '
ec54778989fa3f04c97770477b4db4728e474324':
Update some strings.
Chris Wren [Tue, 9 Jun 2015 16:44:16 +0000 (16:44 +0000)]
am
455b27ee: am
c7581e81: instrument display rotation settings
* commit '
455b27eee06ff6577453936e531186caca000d56':
instrument display rotation settings
Chris Wren [Tue, 9 Jun 2015 16:44:15 +0000 (16:44 +0000)]
am
5d66e170: am
18213459: don\'t double set the dropdown value
* commit '
5d66e17002053fe759c47cb5aae26f70e677e248':
don't double set the dropdown value
Sudheer Shanka [Tue, 9 Jun 2015 16:35:22 +0000 (16:35 +0000)]
am
b259b384: Merge "Update some strings." into mnc-dev
* commit '
b259b3845739f6b66a77b0fb9a14069cb7ff9122':
Update some strings.
Sudheer Shanka [Tue, 9 Jun 2015 16:24:13 +0000 (16:24 +0000)]
Merge "Update some strings." into mnc-dev
Chris Wren [Tue, 9 Jun 2015 16:23:32 +0000 (16:23 +0000)]
am
c7581e81: instrument display rotation settings
* commit '
c7581e8126cefcbac599e95db664dd675c95ef18':
instrument display rotation settings
Chris Wren [Tue, 9 Jun 2015 16:23:31 +0000 (16:23 +0000)]
am
18213459: don\'t double set the dropdown value
* commit '
182134595b9ba63607afceca9c77d62a6ac74066':
don't double set the dropdown value
Chris Wren [Tue, 9 Jun 2015 16:07:14 +0000 (12:07 -0400)]
instrument display rotation settings
Bug:
21530764
Change-Id: Iee36addb7cf3cb6abbbf1ac90727e0fce22121cb
Chris Wren [Tue, 9 Jun 2015 16:06:54 +0000 (12:06 -0400)]
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
Sudheer Shanka [Tue, 9 Jun 2015 13:26:27 +0000 (14:26 +0100)]
Update some strings.
Bug:
20518822
Change-Id: I871a45fe66bd3a3524adcf907c3253c3275d9745
Jim Miller [Tue, 9 Jun 2015 13:01:35 +0000 (13:01 +0000)]
am
6b176ce8: am
fa47bc02: Update and cleanup FingerprintManager API to new spec
* commit '
6b176ce80d95efcd3058d463a26fce870e146466':
Update and cleanup FingerprintManager API to new spec
Jim Miller [Tue, 9 Jun 2015 12:49:16 +0000 (12:49 +0000)]
am
fa47bc02: Update and cleanup FingerprintManager API to new spec
* commit '
fa47bc02900d407e1a730039e94221c2efc160d0':
Update and cleanup FingerprintManager API to new spec
Jim Miller [Wed, 27 May 2015 01:26:11 +0000 (18:26 -0700)]
Update and cleanup FingerprintManager API to new spec
Fixes bug
21040383
Change-Id: Ic2b279ffad47d31a6ad3beed7b3af5ad0a61e815
Tony Mantler [Mon, 8 Jun 2015 21:41:02 +0000 (14:41 -0700)]
Move ApplicationsState to SettingsLib
Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings
b/
21328967
Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e
John Spurlock [Mon, 8 Jun 2015 21:28:59 +0000 (21:28 +0000)]
am
1b76e790: am
9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev
* commit '
1b76e7904744a4cde25af73ff9b378d3a765c640':
Settings: Update notification listener user prompt strings.
John Spurlock [Mon, 8 Jun 2015 21:12:23 +0000 (21:12 +0000)]
am
9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev
* commit '
9a5836107664b796c3ae37c25c89cbf070243edb':
Settings: Update notification listener user prompt strings.
John Spurlock [Mon, 8 Jun 2015 21:04:16 +0000 (21:04 +0000)]
Merge "Settings: Update notification listener user prompt strings." into mnc-dev
John Spurlock [Mon, 8 Jun 2015 20:50:36 +0000 (16:50 -0400)]
Settings: Update notification listener user prompt strings.
Bug:
20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
Jorim Jaggi [Mon, 8 Jun 2015 19:02:37 +0000 (19:02 +0000)]
am
89246fd5: am
7e38eea8: Merge "Fix settings overdraw" into mnc-dev
* commit '
89246fd560d1c1f2209c00c1618e5ec6ac432ce1':
Fix settings overdraw
Jorim Jaggi [Mon, 8 Jun 2015 18:49:06 +0000 (18:49 +0000)]
am
7e38eea8: Merge "Fix settings overdraw" into mnc-dev
* commit '
7e38eea8170249ca13c54748d6ba4c615528cad6':
Fix settings overdraw
Jorim Jaggi [Mon, 8 Jun 2015 18:39:24 +0000 (18:39 +0000)]
Merge "Fix settings overdraw" into mnc-dev
Alex Klyubin [Mon, 8 Jun 2015 18:38:14 +0000 (18:38 +0000)]
am
ddd4d074: am
abe74683: Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
* commit '
ddd4d074380d51d3ca5c83cd1067efa95a2855e3':
Switch from KeyStore.saw to KeyStore.list.
Alex Klyubin [Mon, 8 Jun 2015 18:22:37 +0000 (18:22 +0000)]
am
abe74683: Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
* commit '
abe74683c13f05cc7143c7d4073fcf9a5a829f43':
Switch from KeyStore.saw to KeyStore.list.
Alex Klyubin [Mon, 8 Jun 2015 18:11:15 +0000 (18:11 +0000)]
Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
Paul Lawrence [Mon, 8 Jun 2015 18:00:50 +0000 (11:00 -0700)]
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
Neil Fuller [Mon, 8 Jun 2015 17:43:23 +0000 (17:43 +0000)]
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"
Neil Fuller [Mon, 8 Jun 2015 17:13:42 +0000 (17:13 +0000)]
Merge "Revert "Stop showing long names for local timezones when it is ambiguous""
Neil Fuller [Mon, 8 Jun 2015 17:09:45 +0000 (17:09 +0000)]
Revert "Stop showing long names for local timezones when it is ambiguous"
This reverts commit
cc4d2c22d4c444e877830b77a1e4246ca292e662.
Change-Id: I04773f3dd0f2d5756e6901185fe24b5310c5041e
John Spurlock [Mon, 8 Jun 2015 17:04:17 +0000 (17:04 +0000)]
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.
Geoff Mendal [Mon, 8 Jun 2015 17:04:16 +0000 (17:04 +0000)]
am
f53cc1d7: (-s ours) am
0053802f: (-s ours) Import translations. DO NOT MERGE
* commit '
f53cc1d7975295fa3a2fc584e5a051fbf659c948':
Import translations. DO NOT MERGE
Martijn Coenen [Mon, 8 Jun 2015 17:04:15 +0000 (17:04 +0000)]
am
4504eb36: am
1276b213: Merge "Add NFC payment "how it works" screens." into mnc-dev
* commit '
4504eb36be7932bbd3fe1c9e0759ef7231dbb70d':
Add NFC payment "how it works" screens.
Martijn Coenen [Mon, 8 Jun 2015 17:04:14 +0000 (17:04 +0000)]
am
dcf324c0: am
63f7fc88: Merge "NFC: don\'t use dynamic resources." into mnc-dev
* commit '
dcf324c0b3917c8d9007a58bc35591c75793c422':
NFC: don't use dynamic resources.
Neil Fuller [Mon, 8 Jun 2015 16:59:00 +0000 (16:59 +0000)]
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
John Spurlock [Mon, 8 Jun 2015 16:52:01 +0000 (16:52 +0000)]
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.
Geoff Mendal [Mon, 8 Jun 2015 16:44:22 +0000 (16:44 +0000)]
am
0053802f: (-s ours) Import translations. DO NOT MERGE
* commit '
0053802f23cfad9116f05716d2d5f651c19159ae':
Import translations. DO NOT MERGE
Martijn Coenen [Mon, 8 Jun 2015 16:42:41 +0000 (16:42 +0000)]
am
1276b213: Merge "Add NFC payment "how it works" screens." into mnc-dev
* commit '
1276b21317d0f86bbd3f59b14d9c0c745cecfa56':
Add NFC payment "how it works" screens.
Martijn Coenen [Mon, 8 Jun 2015 16:42:40 +0000 (16:42 +0000)]
am
63f7fc88: Merge "NFC: don\'t use dynamic resources." into mnc-dev
* commit '
63f7fc8847afe5029cabe5f07cc9e3ffce9f65c9':
NFC: don't use dynamic resources.
John Spurlock [Mon, 8 Jun 2015 16:39:32 +0000 (16:39 +0000)]
Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
Alex Klyubin [Mon, 8 Jun 2015 16:30:08 +0000 (09:30 -0700)]
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
John Spurlock [Thu, 4 Jun 2015 17:01:59 +0000 (13:01 -0400)]
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
Geoff Mendal [Mon, 8 Jun 2015 14:59:45 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0fb7a99f74e15a5bf9842cf30eedaa8443164bc5
Auto-generated-cl: translation import
Neil Fuller [Mon, 8 Jun 2015 09:36:20 +0000 (09:36 +0000)]
Merge "Stop showing long names for local timezones when it is ambiguous"
Martijn Coenen [Mon, 8 Jun 2015 08:02:28 +0000 (08:02 +0000)]
Merge "Add NFC payment "how it works" screens." into mnc-dev
Martijn Coenen [Mon, 8 Jun 2015 08:01:45 +0000 (08:01 +0000)]
Merge "NFC: don't use dynamic resources." into mnc-dev
Sanket Padawe [Sat, 6 Jun 2015 02:21:16 +0000 (02:21 +0000)]
am
ca324f5a: am
547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev
* commit '
ca324f5abf12bab607c74c5aaa0c5e256c5dcefc':
Fix wifi network strings shown in Settings.
Sanket Padawe [Sat, 6 Jun 2015 02:09:10 +0000 (02:09 +0000)]
am
547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev
* commit '
547089c3768f3266a1f18e6d1f42a81aeb0b3bcf':
Fix wifi network strings shown in Settings.
Sanket Padawe [Sat, 6 Jun 2015 01:58:18 +0000 (01:58 +0000)]
Merge "Fix wifi network strings shown in Settings." into mnc-dev
Sanket Padawe [Sat, 6 Jun 2015 01:49:12 +0000 (18:49 -0700)]
Fix wifi network strings shown in Settings.
Bug:
21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
Jorim Jaggi [Sat, 6 Jun 2015 00:42:32 +0000 (17:42 -0700)]
Fix settings overdraw
Bug:
17185183
Change-Id: Ide5adf1e61f727a49bc70e0adc754eeb09321122
Ruben Brunk [Sat, 6 Jun 2015 00:29:46 +0000 (00:29 +0000)]
am
bf493816: am
e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
* commit '
bf4938166fc539d348dfb8167b03637fecf4d6c0':
Add UI for camera + flashlight battery reporting.
Ruben Brunk [Sat, 6 Jun 2015 00:16:22 +0000 (00:16 +0000)]
am
e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
* commit '
e35df2ff3b8188bdf710f84390f0fc60ec329ab5':
Add UI for camera + flashlight battery reporting.
Ruben Brunk [Sat, 6 Jun 2015 00:04:17 +0000 (00:04 +0000)]
Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
Ruben Brunk [Thu, 4 Jun 2015 01:53:40 +0000 (18:53 -0700)]
Add UI for camera + flashlight battery reporting.
Bug:
11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
Martijn Coenen [Fri, 5 Jun 2015 19:28:17 +0000 (21:28 +0200)]
Add NFC payment "how it works" screens.
Bug:
21239081
Bug:
21305138
Bug:
21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
Maurice Lam [Fri, 5 Jun 2015 19:34:20 +0000 (19:34 +0000)]
am
e8f39de6: am
26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
* commit '
e8f39de661a4a22ced8c72677f53f5420792736e':
Update Setup Wizard redaction interstitial styles
Maurice Lam [Fri, 5 Jun 2015 19:22:46 +0000 (19:22 +0000)]
am
26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
* commit '
26a42d1099fece0bc388db2b923ad5c5411bd4f3':
Update Setup Wizard redaction interstitial styles
Maurice Lam [Fri, 5 Jun 2015 19:13:17 +0000 (19:13 +0000)]
Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
Jorim Jaggi [Fri, 5 Jun 2015 18:39:14 +0000 (18:39 +0000)]
am
685a359c: am
5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev
* commit '
685a359ca1b3a20fcdc8dae92a5a050c2a7ea3bd':
Fix lockpattern weirdness
Jorim Jaggi [Fri, 5 Jun 2015 18:26:21 +0000 (18:26 +0000)]
am
5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev
* commit '
5ae7cf3a144d1a55fcd40e84567408caf1ced9f4':
Fix lockpattern weirdness
Jorim Jaggi [Fri, 5 Jun 2015 18:12:16 +0000 (18:12 +0000)]
Merge "Fix lockpattern weirdness" into mnc-dev
Neil Fuller [Thu, 4 Jun 2015 15:40:53 +0000 (16:40 +0100)]
Stop showing long names for local timezones when it is ambiguous
Context:
Android uses a hand-crafted list for timezones to pick from in
Settings. Independently of what we actually show the user, when a
user is selecting their timezone they are selecting an olson timezone
ID. Separate olson ids exist for a sets of zone rules. If two places
have differed in their zone rules in the past they have different
olson ids. Olson Ids are usually named after cities and have
"exemplar locations", e.g. "Europe/London" covers the UK and the
exemplar location is "London".
Exemplar locations were often chosen based on historic considerations
and do not necessarily make sense to contemporary users.
Normal Android users don't know or care about any of this, but they do
understand geography/cities and sometimes understand things like
timezone names like "British Summer Time" (but usually not in other
countries).
Unfortunately timezone names understood by users also don't have a
one-to-one mapping with olson IDs. Two places can have the same
timezone name for part of the year but not the rest. For example, all
of a the country Foo may be using "Foo Standard Time" for part of the
year, but in summer some parts of the country may switch to "Foo
Summer Time" while others stay on "Foo Standard Time". These would
have different Olson Ids.
Also, two places that historically differed in their choice of
timezone rules may have since aligned. e.g. parts of Europe. They
still have their own olson ids.
The Android hand-crafted list is (I assume) based on a set of
compromises to provide reasonable coverage of users' needs without
overwhelming them with too many choices for historic irrelevancies.
To assist with picking a timezone that makes sense to a user, Android
currently does the following:
When selecting a timezone:
For "local" timezones Android shows the timezone "long name". e.g.
"British Summer Time", "Eastern Standard Time".
For non-local timezones Android uses the exemplar location (e.g. the
city).
This had an issue:
Some "local" timezones, e.g. Australia for English (Australian),
would show multiple entries for the same long timezone name without
any way of telling them apart.
After this change:
This change means that settings now uses the exemplar location in
preference when the Android display strings would be ambiguous. For
countries where there is no ambiguity (e.g. the UK) Android continues
to use the timezone long name.
Bug:
19058953
Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2132
Change-Id: I6d4d34ea950f94e569e133670c2287b34ba50e30
ztenghui [Fri, 5 Jun 2015 17:02:40 +0000 (17:02 +0000)]
am
b1651d0e: am
167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
* commit '
b1651d0e1f3d99bca8cec07f53258b05d169e618':
Setup the animation callback for AnimatedVectorDrawable
ztenghui [Fri, 5 Jun 2015 16:50:14 +0000 (16:50 +0000)]
am
167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
* commit '
167a6bcdb74f9f47943a8f16b52e7d1b5ac35589':
Setup the animation callback for AnimatedVectorDrawable
ztenghui [Fri, 5 Jun 2015 16:37:04 +0000 (16:37 +0000)]
Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 13:55:14 +0000 (13:55 +0000)]
am
92f53c02: am
1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev
* commit '
92f53c0223a84526b51d22d0799e55bc486d63c1':
Settings > Apps list style updates
Jason Monk [Fri, 5 Jun 2015 13:48:13 +0000 (13:48 +0000)]
am
1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev
* commit '
1b93ef1d9b1af8a8b897dfe4b4f1730f4e64f450':
Settings > Apps list style updates
Jason Monk [Fri, 5 Jun 2015 13:43:35 +0000 (13:43 +0000)]
am
f5a7d673: am
d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev
* commit '
f5a7d673fa1f5707f277e426f9c1e3ef33acee6e':
Fix some dark theme issues (Take 2)
Jason Monk [Fri, 5 Jun 2015 13:36:27 +0000 (13:36 +0000)]
Merge "Settings > Apps list style updates" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 13:31:00 +0000 (13:31 +0000)]
am
d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev
* commit '
d7dbe16142b0fc3faf448a81f3be13af7e95909f':
Fix some dark theme issues (Take 2)
Jason Monk [Fri, 5 Jun 2015 13:23:12 +0000 (13:23 +0000)]
Merge "Fix some dark theme issues (Take 2)" into mnc-dev
Martijn Coenen [Fri, 5 Jun 2015 09:36:50 +0000 (11:36 +0200)]
NFC: don't use dynamic resources.
Also fixed talk-back for the default
payment app selection.
Bug:
21343778
Bug:
21588534
Change-Id: I2886b73edae507c7861351bac4610dbf3bebe027
Jorim Jaggi [Fri, 5 Jun 2015 01:00:34 +0000 (18:00 -0700)]
Fix lockpattern weirdness
- Pass back correct result when pressing cancel.
- Make sure the start the interstitial activity after checking so
we don't preempt the async thread we are still running.
Bug:
21621918
Change-Id: I5558089abf02a00a268050fc48894cea86692fa0