PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,490 Commits 1 Branch 0 Tags
b745831e3ffbb88ebff2d707884b07914916f6b6
Commit Graph

21490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Geoff Mendal
0053802f23 Import translations. DO NOT MERGE 
Change-Id: I0fb7a99f74e15a5bf9842cf30eedaa8443164bc5
Auto-generated-cl: translation import
 2015-06-08 07:59:45 -07:00
Geoff Mendal
11ad1c5ce8 Import translations. DO NOT MERGE 
Change-Id: I3100fecd7045a2ffcd4fea92b5664a5ba96d257a
Auto-generated-cl: translation import
 2015-06-08 07:27:19 -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
dca52b023d am 7e7376bf: am ca324f5a: am 547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev 
* commit '7e7376bf757c54e892bf963810101a0237b4dc4f':
  Fix wifi network strings shown in Settings.
 2015-06-06 17:05:17 +00:00
The Android Automerger
b12afbee46 merge in mnc-release history after reset to mnc-dev 2015-06-06 01:04:57 -07: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
Sanket Padawe
ca324f5abf am 547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev 
* commit '547089c3768f3266a1f18e6d1f42a81aeb0b3bcf':
  Fix wifi network strings shown in Settings.
 2015-06-06 02:09:10 +00:00
Sanket Padawe
547089c376 Merge "Fix wifi network strings shown in Settings." into mnc-dev 2015-06-06 01:58:20 +00:00
Sanket Padawe
2816e4e3e0 Fix wifi network strings shown in Settings. 
Bug: 21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
 2015-06-05 18:49:12 -07:00
Jorim Jaggi
1fdd4f521c Fix settings overdraw 
Bug: 17185183
Change-Id: Ide5adf1e61f727a49bc70e0adc754eeb09321122
 2015-06-05 17:42:32 -07:00
Ruben Brunk
823ea696c7 am 2585210c: am bf493816: am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit '2585210c8da69c8882f8f86fd3273d5f623248fd':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:41:12 +00:00
Ruben Brunk
2585210c8d am bf493816: am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit 'bf4938166fc539d348dfb8167b03637fecf4d6c0':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:29:46 +00:00
Ruben Brunk
bf4938166f am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit 'e35df2ff3b8188bdf710f84390f0fc60ec329ab5':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:16:22 +00:00
Ruben Brunk
e35df2ff3b Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:19 +00:00
Ruben Brunk
2627190bac Add UI for camera + flashlight battery reporting. 
Bug: 11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
 2015-06-05 16:05:18 -07:00
Maurice Lam
7c8e7d7ad8 am 32d1728a: am e8f39de6: am 26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev 
* commit '32d1728aa3419321e9e09113ceb9ba9642777e28':
  Update Setup Wizard redaction interstitial styles
 2015-06-05 19:46:10 +00:00
Martijn Coenen
cbcc76e8d3 Add NFC payment "how it works" screens. 
Bug: 21239081
Bug: 21305138
Bug: 21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
 2015-06-05 21:35:55 +02:00
Maurice Lam
32d1728aa3 am e8f39de6: am 26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev 
* commit 'e8f39de661a4a22ced8c72677f53f5420792736e':
  Update Setup Wizard redaction interstitial styles
 2015-06-05 19:34:20 +00:00
Maurice Lam
e8f39de661 am 26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev 
* commit '26a42d1099fece0bc388db2b923ad5c5411bd4f3':
  Update Setup Wizard redaction interstitial styles
 2015-06-05 19:22:46 +00:00
Maurice Lam
26a42d1099 Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev 2015-06-05 19:13:18 +00:00
Jorim Jaggi
00eeb30800 am 3975dbc5: am 685a359c: am 5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev 
* commit '3975dbc5e88bf38df41e65ae7e5b2495468bb8e0':
  Fix lockpattern weirdness
 2015-06-05 18:51:59 +00:00
Jorim Jaggi
3975dbc5e8 am 685a359c: am 5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev 
* commit '685a359ca1b3a20fcdc8dae92a5a050c2a7ea3bd':
  Fix lockpattern weirdness
 2015-06-05 18:39:14 +00:00
Jorim Jaggi
685a359ca1 am 5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev 
* commit '5ae7cf3a144d1a55fcd40e84567408caf1ced9f4':
  Fix lockpattern weirdness
 2015-06-05 18:26:21 +00:00
Jorim Jaggi
5ae7cf3a14 Merge "Fix lockpattern weirdness" into mnc-dev 2015-06-05 18:12:17 +00:00
Neil Fuller
cc4d2c22d4 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
 2015-06-05 18:19:36 +01:00
ztenghui
cb791ec938 am 99b66dc7: am b1651d0e: am 167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 
* commit '99b66dc776ca624b30303b8a6405657aee834c25':
  Setup the animation callback for AnimatedVectorDrawable
 2015-06-05 17:14:31 +00:00
ztenghui
99b66dc776 am b1651d0e: am 167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 
* commit 'b1651d0e1f3d99bca8cec07f53258b05d169e618':
  Setup the animation callback for AnimatedVectorDrawable
 2015-06-05 17:02:40 +00:00
ztenghui
b1651d0e1f am 167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 
* commit '167a6bcdb74f9f47943a8f16b52e7d1b5ac35589':
  Setup the animation callback for AnimatedVectorDrawable
 2015-06-05 16:50:14 +00:00
ztenghui
167a6bcdb7 Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 2015-06-05 16:37:05 +00:00
Jason Monk
2055685bfd am 9344bf62: am 92f53c02: am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev 
* commit '9344bf62321c4c344677b10684935c44be159e7c':
  Settings > Apps list style updates
 2015-06-05 14:08:44 +00:00
Jason Monk
9344bf6232 am 92f53c02: am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev 
* commit '92f53c0223a84526b51d22d0799e55bc486d63c1':
  Settings > Apps list style updates
 2015-06-05 13:55:14 +00:00
Jason Monk
2ccfdac69f am 28efc11e: am f5a7d673: am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev 
* commit '28efc11e2bfd94f4b5ba962201f99bbf946b7d27':
  Fix some dark theme issues (Take 2)
 2015-06-05 13:54:33 +00:00
Jason Monk
92f53c0223 am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev 
* commit '1b93ef1d9b1af8a8b897dfe4b4f1730f4e64f450':
  Settings > Apps list style updates
 2015-06-05 13:48:13 +00:00
Jason Monk
28efc11e2b am f5a7d673: am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev 
* commit 'f5a7d673fa1f5707f277e426f9c1e3ef33acee6e':
  Fix some dark theme issues (Take 2)
 2015-06-05 13:43:35 +00:00