Commit Graph

18048 Commits

Author SHA1 Message Date
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
Neil Fuller
91e20200c5 Merge "Stop showing long names for local timezones when it is ambiguous" 2015-06-08 09:36:20 +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
Tom O'Neill
1542f9c7d3 Merge "LocationSettings javadoc describes what's in the UI" 2015-06-04 16:28:21 +00:00
Jason Monk
21c430160f Merge "Dont crash if there is no spellchecker" 2015-06-03 13:28:58 +00:00
Fyodor Kupolov
b995c78fbb Merge "Added SearchIndexProvider for UserSettings" 2015-05-20 23:40:50 +00:00
Fyodor Kupolov
580e2e7ce1 Added SearchIndexProvider for UserSettings
It enables customizations for certain cases like whether the user is able to
create restricted profiles or multiuser UI is disabled.

Bug: 21197002
Change-Id: Ia672c0f9bb451877f8debe04438b46cb2b7e9242
2015-05-20 14:23:52 -07:00
Fyodor Kupolov
e84a5eac2c Merge "Remove the check hasMultipleUsers in Settings." 2015-05-19 17:50:01 +00:00
Tom O'Neill
f409181f4d LocationSettings javadoc describes what's in the UI
- In particular, tells OEMs how to add their own settings

Change-Id: I45e4fb7ff59705a2bcb53a72c71fd230f2e085c5

# Conflicts:
#	src/com/android/settings/location/LocationSettings.java
2015-05-19 10:32:46 -07:00
Nicolas Prevot
ea5677e1a3 Remove the check hasMultipleUsers in Settings.
When deciding to show the user section or not, Just rely
on supportsMultipleUsers. Don't check hasMultipleUsers.

BUG:21119929
Change-Id: Ifbddac10e2f6dc02b8e2e55b41ab9f5be018dfca
2015-05-14 13:02:14 -07:00
Robert Greenwalt
a1a2c91b7d Merge "Remove phone information for a secondary user" 2015-05-13 21:20:51 +00:00
Nick Kralevich
1cfc2fc41d Merge "Avoid SElinux denial accessing SIM card lock" 2015-05-11 19:45:21 +00:00
Chad Brubaker
2ed7fc80ff Merge "Track keystore password method changes" 2015-05-11 19:30:45 +00:00
Chad Brubaker
6c3b678ca2 Track keystore password method changes
(cherry-picked from commit 7236f2abba)

Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
2015-05-11 11:21:55 -07:00
Hemanth kumar B
bef7221a7d Avoid SElinux denial accessing SIM card lock
This change avoids the following SELinux denial:

  W/SharedPreferenc(28238): type=1400 audit(0.0:8): avc: denied\
  { search } for name="com.android.settings" dev="mmcblk0p25"\
  ino=8209 scontext=u:r:radio:s0 tcontext=u:object_r:system_app\
  _data_file:s0 tclass=dir op_res=-13 ppid=318 pcomm="main"\
  tgid=1850 tgcomm="m.android.phone"

When accessing Settings->Security->Set up SIM card lock.

There is really no need to store this information in
SharedPreferences anyway.

Change-Id: I3ba30d5d5e2c5b3c379397fbb06325101acaf490
2015-05-10 17:21:35 +02:00
Raju Yadav
05fb069d65 Remove phone information for a secondary user
Default phone information is not available for a secondary
user and when accessed using service command *#*#INFO#*#*,
it causes crash in Settings. Removed the preference for a
secondary user.

To verify:
1. Add user(slide down status bar>user icon>Add user>
   OK>finish the setup guide).
2. As new user launch Phone app>input “*#*#4636#*#*”>
   tap Phone information>check
Causes Settings to crash with:
  Caused by: java.lang.IllegalStateException: Default phones haven't been made yet!
  at com.android.internal.telephony.PhoneFactory.getDefaultPhone(PhoneFactory.java:214)
  at com.android.settings.RadioInfo.onCreate(RadioInfo.java:263)
  at android.app.Activity.performCreate(Activity.java:5990)
  at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1106)
  at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2278)

Change-Id: Ie23107c5eead04183cfd8b5460a9a7a3426a99b8
2015-05-07 20:22:24 +02:00
Nick Kralevich
a6867f55e5 Merge "Avoid SElinux denial accessing IMEI information" 2015-05-07 18:21:18 +00:00
Raju Yadav
b2ad5bb522 Avoid SElinux denial accessing IMEI information
Set persistent attribute to false so preferences are not
stored in shared preferences, this avoids the SElinux
denial:

  W/SharedPreferenc( 6950): type=1400 audit(0.0:4): avc: \
  denied { search } for name="com.android.settings" \
  dev="mmcblk0p25" ino=48929 scontext=u:r:radio:s0 \
  tcontext=u:object_r:system_app_data_file:s0 tclass=dir\
  op_res=-13 ppid=319 pcomm="main" tgid=1589\
  tgcomm="m.android.phone"

Observed when entering IMEI information in:
Settings > About Phone > Status > IMEI information.

It makes no sense to store this information in shared
preferences anyway so no functinoality is lost with this
change.

Change-Id: Id778bbadc8141167d679177b39e1d7a540d5752c
2015-05-07 19:18:39 +02:00
Elliott Hughes
a9657f553d Merge "Add Pacific/Noumea." 2015-04-28 20:41:53 +00:00
Elliott Hughes
23ae8827c1 Add Pacific/Noumea.
Also move Majuro to the right place in the list. It's +11, not -11.

Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
2015-04-28 13:35:25 -07:00
Alan Viverette
93ecb1f012 Merge "Settings: Fix wifi developer options summaries" 2015-04-24 18:05:10 +00:00
Elliott Hughes
2e30bff135 Merge "Add Europe/Madrid." 2015-04-16 15:03:03 +00:00
Elliott Hughes
09ca2a9823 Add Europe/Madrid.
50 million Spaniards can't be wrong.

Bug: 19519953
Change-Id: I10712165d32d90977453e7053057e6260c005f84
2015-04-15 17:37:16 -07:00
Johan Redestig
093a646772 Dont crash if there is no spellchecker
The fact that isSpellCheckerEnabled returns true does not mean
that getCurrentSpellChecker will return non null. By default
isSpellCheckerEnabled is true in TextServicesSettings, even when
there is no spellchecker service active on the device.

The issue can be verified by disabling the Google Keyboard (assuming
the GMS LatinImeGoogle is used) in Settings|Apps and later
entering Settings|Language & input. Without this patch Settings
crashes at that point with the following stack:

E/AndroidRuntime(13020): Caused by: java.lang.NullPointerException: \
Attempt to invoke virtual method 'java.lang.CharSequence android.vie\
w.textservice.SpellCheckerInfo.loadLabel(android.content.pm.PackageM\
anager)' on a null object reference
E/AndroidRuntime(13020):        at com.android.settings.inputmethod.\
InputMethodAndLanguageSettings.onResume(InputMethodAndLanguageSettin\
gs.java:253)
E/AndroidRuntime(13020):        at android.app.Fragment.performResum\
e(Fragment.java:2096)
E/AndroidRuntime(13020):        at android.app.FragmentManagerImpl.m\
oveToState(FragmentManager.java:928)
E/AndroidRuntime(13020):        at android.app.FragmentManagerImpl.m\
oveToState(FragmentManager.java:1067)

Bug: 19832033
Change-Id: I65e6d269572e064aa6897807b6611ef947d90211
2015-04-09 17:40:57 +00:00
Elliott Hughes
189d7e8e51 Merge "Add Europe/Istanbul timezone" 2015-04-02 17:19:27 +00:00
Samuel Asteberg
7019943855 Add Europe/Istanbul timezone
Change-Id: I522107e7aead4d7ec587a19202af23df71d16d83
2015-04-02 18:18:24 +02:00
Elliott Hughes
49fe5084f7 Merge "add Recife timezone" 2015-04-01 23:55:55 +00:00
Michael Bestas
4566fc2e81 Settings: Fix wifi developer options summaries
Change-Id: I85688d59685d3a0b0a48e51581eee77ebc7cd2fa
2015-03-20 21:54:49 +02:00
Geoff Mendal
cfad6fc1ff Import translations. DO NOT MERGE
Change-Id: I6e606f63db232302aa02be469a2560a5455eb11e
Auto-generated-cl: translation import
2015-02-26 13:08:22 -08:00
Sanket Padawe
4a7ca7d5a7 am bdfdf07c: am 0362e870: am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit 'bdfdf07ce3b788d2962f75027f6be615c9784e10':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-13 00:01:08 +00:00
Sanket Padawe
bdfdf07ce3 am 0362e870: am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '0362e870b258b03ec06110d032b521cac3d37bf2':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-12 23:55:01 +00:00
Sanket Padawe
0362e870b2 am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '7e21fa5ab4f867263088a38ed279d889b902a05b':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-12 23:47:52 +00:00
Sanket Padawe
7e21fa5ab4 Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
2015-02-12 12:39:34 -08:00
Geoff Mendal
785bfe719c am 31010cc1: (-s ours) Import translations. DO NOT MERGE
* commit '31010cc15530338fdcf4e1a66a47d29c6851cbc6':
  Import translations. DO NOT MERGE
2015-02-12 19:20:43 +00:00
Geoff Mendal
31010cc155 Import translations. DO NOT MERGE
Change-Id: I130d234905731c2df5249e2c769c572bbb61f94e
Auto-generated-cl: translation import
2015-02-12 11:05:53 -08:00
Alex Klyubin
e029b91c53 am 1d33bca0: Merge "Hidden ApplicationInfo flags are now in privateFlags."
* commit '1d33bca0e496f980ec1a364f58cccd457d40954a':
  Hidden ApplicationInfo flags are now in privateFlags.
2015-02-11 19:47:09 +00:00
Alex Klyubin
1d33bca0e4 Merge "Hidden ApplicationInfo flags are now in privateFlags." 2015-02-11 19:27:25 +00:00
Geoff Mendal
f513ca2fa1 am d232a3fa: (-s ours) am 60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit 'd232a3fa5c86f19ccf559bf4dc649d39d3620ca3':
2015-02-11 19:20:15 +00:00
Alex Klyubin
cc254f4da9 Hidden ApplicationInfo flags are now in privateFlags.
See b9f8a5204a1b0b3919fa921e858d04124c582828.

Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b
2015-02-11 11:10:12 -08:00
Geoff Mendal
d232a3fa5c am 60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit '60d2ee878896ccf29f99b825cdbae75182ed41f3':
  Import translations. DO NOT MERGE
2015-02-11 15:03:56 +00:00
Geoff Mendal
96a90af83b Import translations. DO NOT MERGE
automerge: 60d2ee8  -s ours

* commit '60d2ee878896ccf29f99b825cdbae75182ed41f3':
  Import translations. DO NOT MERGE
2015-02-11 15:00:50 +00:00
Geoff Mendal
60d2ee8788 Import translations. DO NOT MERGE
Change-Id: I7d22626907a0705a5de9956d740ed6ddaf9a6ca0
Auto-generated-cl: translation import
2015-02-11 06:50:09 -08:00
Geoff Mendal
278c81a626 am 37dfabff: (-s ours) am 713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '37dfabff82bd78d0956f41868579bdf5eb885078':
  Import translations. DO NOT MERGE
2015-02-09 16:31:32 +00:00
Geoff Mendal
37dfabff82 am 713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '713e794dac88e4e977faa95da88163db6a568e15':
  Import translations. DO NOT MERGE
2015-02-09 16:07:10 +00:00
Geoff Mendal
713e794dac Import translations. DO NOT MERGE
Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import
2015-02-09 06:31:43 -08:00
Geoff Mendal
2a9fef1ae7 Import translations. DO NOT MERGE
automerge: 40e66bc  -s ours

* commit '40e66bce6ceea1b2b9d49a26564665222eb32745':
  Import translations. DO NOT MERGE
2015-02-04 15:04:49 +00:00
Geoff Mendal
40e66bce6c Import translations. DO NOT MERGE
Change-Id: I6c5b25e39ed6da72c5e7a85329947bec91032120
Auto-generated-cl: translation import
2015-02-04 06:50:08 -08:00
Amith Yamasani
47ba346e1e Merge "set tapjacking protection for deviceadmin permission dialog"
automerge: 6317e06

* commit '6317e06635ed52a9d1c1aeb0439017418f57ad0f':
  set tapjacking protection for deviceadmin permission dialog
2015-02-03 21:29:19 +00:00
Amith Yamasani
6317e06635 Merge "set tapjacking protection for deviceadmin permission dialog" 2015-02-03 21:24:51 +00:00