Elliott Hughes
3d83f5ca9c
am caeb7a6e: Merge "Get time zone names from CLDR."
...
* commit 'caeb7a6e627a8326b3268a8ca588b7ea0d3d700c':
Get time zone names from CLDR.
2013-09-13 16:11:43 -07:00
Elliott Hughes
f1582bc3f5
Get time zone names from CLDR.
...
Since the intent appears to have been "use the zone's local names if
they're in the same country, and use exemplar locations otherwise",
this patch gets the localized CLDR time zone name or the localized
CLDR exemplar location as appropriate.
Bug: 8145760
Bug: 10179879
Change-Id: Ib3968a493de9f0d3040f3afa6ca07d9f44566a32
2013-09-10 16:46:59 -07:00
Dianne Hackborn
9a4f4656d7
am a5ac281d: am 40557800: Fix issue #10190597 : "Any permission restrictions" is displayed after a...
...
* commit 'a5ac281db7103aef790a6141cd72fdbc22835552':
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
2013-08-05 16:49:02 -07:00
Dianne Hackborn
4055780094
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
...
...newline in "Reset app preferences" dialog
Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
2013-08-05 16:23:58 -07:00
Dianne Hackborn
ad38b60b37
am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.
...
* commit '0a09b13c81bb0ebe556e46e3859a25805b2cbdcf':
Reset app preferences now resets all app ops.
2013-08-02 19:32:14 -07:00
Dianne Hackborn
a6683e0f4a
Reset app preferences now resets all app ops.
...
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
2013-08-02 19:20:48 -07:00
Baligh Uddin
0cb5701106
Import translations. DO NOT MERGE
...
Change-Id: I5ab9317a61cf7adb7c911ac19770e9ae7d4f935b
Auto-generated-cl: translation import
2013-07-29 10:53:05 -07:00
Baligh Uddin
693abd3136
Import translations. DO NOT MERGE
...
Change-Id: I8dd4886617b33c56d57ef050c560a91748b68113
Auto-generated-cl: translation import
2013-07-24 12:15:51 -07:00
Baligh Uddin
542960fbbb
Import translations. DO NOT MERGE
...
Change-Id: Iddc12747b1f57abb0a10f452b551332e86d2ba3c
Auto-generated-cl: translation import
2013-07-24 12:14:17 -07:00
Baligh Uddin
dd00b6b013
Import translations. DO NOT MERGE
...
Change-Id: I8c68608b9494ea120e4620cfa3c0027298c0082a
Auto-generated-cl: translation import
2013-07-22 11:10:07 -07:00
Baligh Uddin
6b939fe2c8
Import translations. DO NOT MERGE
...
Change-Id: I2f0dc917cd2d67b4478f74d0e2dccec53eb9f921
Auto-generated-cl: translation import
2013-07-22 11:08:10 -07:00
Baligh Uddin
aafe0b9134
Import translations. DO NOT MERGE
...
Change-Id: Ife5526347f8eab9b8b385b5b6f265c1678b8e94a
Auto-generated-cl: translation import
2013-07-18 14:31:45 -07:00
Baligh Uddin
68b8750554
Import translations. DO NOT MERGE
...
Change-Id: I09a9a2433e7be85d771059ecd1c4a514a3f61371
Auto-generated-cl: translation import
2013-07-18 14:30:01 -07:00
Baligh Uddin
3f573faef9
Import translations. DO NOT MERGE
...
Change-Id: I5ed3429648c82e9a2cf4ca62f308639371bcfdde
Auto-generated-cl: translation import
2013-07-15 11:38:16 -07:00
Baligh Uddin
f9d691707c
Import translations. DO NOT MERGE
...
Change-Id: I0f107b738c6aa5f0aeb538ccf991f64fac47fd5c
Auto-generated-cl: translation import
2013-07-15 11:36:58 -07:00
Baligh Uddin
2a1ccab1cd
Import translations. DO NOT MERGE
...
Change-Id: I6b02734b2ef1396af16da6e8102cdbb6ca79a50c
Auto-generated-cl: translation import
2013-07-10 20:28:57 -07:00
Baligh Uddin
f1d02056d9
Import translations. DO NOT MERGE
...
Change-Id: I7d34201de76770bcb6a1998c6d898830ca290006
Auto-generated-cl: translation import
2013-07-08 09:17:21 -07:00
Baligh Uddin
76185f7201
Import translations. DO NOT MERGE
...
Change-Id: Ia71c4566436300b1c190865f9dc0d490d62d8ebb
Auto-generated-cl: translation import
2013-07-03 13:54:27 -07:00
Baligh Uddin
aa03b2f6a6
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-07-02 16:34:18 +00:00
Wink Saville
5d5a269f59
Add Manage mobile plan to Settings.
...
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
2013-07-01 16:27:10 -07:00
Baligh Uddin
a2fa332286
Import translations. DO NOT MERGE
...
Change-Id: I69c1ffe7da49a43516d5233f6f4c7cec6227eb04
Auto-generated-cl: translation import
2013-07-01 09:19:04 -07:00
Amith Yamasani
bf87f7d78d
Fix inconsistent string
...
Bug: 9602425
Change-Id: I2c5a2350668e48f12e821e0553df56ed08d373f5
2013-06-27 09:41:15 -07:00
Baligh Uddin
80a0d9a37c
Import translations. DO NOT MERGE
...
Change-Id: Ia1811e28f847bc50278d40cfe989e2fa284d0f12
Auto-generated-cl: translation import
2013-06-19 12:40:06 -07:00
Baligh Uddin
7f37c30b71
Import translations. DO NOT MERGE
...
Change-Id: I7da4461fe8f9c64191a5e0c46ae6d5ad4d7293a1
Auto-generated-cl: translation import
2013-06-17 09:14:19 -07:00
Baligh Uddin
0117cc7ce5
Import translations. DO NOT MERGE
...
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
2013-06-12 12:51:36 -07:00
Baligh Uddin
f616ef4306
Import translations. DO NOT MERGE
...
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
2013-06-05 11:51:21 -07:00
Baligh Uddin
804b8b60e7
Import translations. DO NOT MERGE
...
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
2013-06-03 11:48:00 -07:00
Baligh Uddin
586376a036
Import translations. DO NOT MERGE
...
Change-Id: I484fae1bba709cad545b168242e79291e9599346
Auto-generated-cl: translation import
2013-05-29 19:29:10 -07:00
Baligh Uddin
44338bae31
Import translations. DO NOT MERGE
...
Change-Id: I3808f0d486b1050f53c5f3d9129f758d66db68df
Auto-generated-cl: translation import
2013-05-27 11:58:11 -07:00
Baligh Uddin
6fa5e627b8
Import translations. DO NOT MERGE
...
Change-Id: I42d8fcaccbdec16d54e85adcd73e4c455097715d
Auto-generated-cl: translation import
2013-05-23 00:31:54 -07:00
Amith Yamasani
7c4dfccda4
Update strings for clarity about restricted profiles
...
Bug: 9051422
Bug: 9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e
2013-05-22 12:51:30 -07:00
Baligh Uddin
27d5c392ba
Import translations. DO NOT MERGE
...
Change-Id: Idaa8cda2a62a48bfaf80cd2a3c848ab99179dcda
Auto-generated-cl: translation import
2013-05-17 12:17:02 -07:00
Amith Yamasani
1d4329631d
Add a settings icon to restricted profile config header
...
This is to make it obvious that the header invokes user info settings.
Bug: 8888002
Also fix a minor copy/paste error in contentDesription attribute.
Change-Id: I3a90b0d691df8302fee696d82c5819f43109ae8e
2013-05-13 14:58:56 -07:00
Baligh Uddin
0a3cf29344
Import translations. DO NOT MERGE
...
Change-Id: I7bfc101728e9083d730511df65771c9899ab6549
Auto-generated-cl: translation import
2013-05-13 09:42:52 -07:00
Baligh Uddin
2c766ba56c
Import translations. DO NOT MERGE
...
Change-Id: I693437e166d38e6b56a9b568c455daebfde8694d
Auto-generated-cl: translation import
2013-05-08 11:03:17 -07:00
Baligh Uddin
c6adece066
Import translations. DO NOT MERGE
...
Change-Id: Ib1986e8c494733193e49c1504a4cc9396649a324
Auto-generated-cl: translation import
2013-05-06 11:59:20 -07:00
Baligh Uddin
6681e954a8
Import translations. DO NOT MERGE
...
Change-Id: I6905b70a4bfdbab57f787be455fead0a995904a2
Auto-generated-cl: translation import
2013-05-03 13:12:52 -07:00
Baligh Uddin
6c886cd394
Import translations. DO NOT MERGE
...
Change-Id: I09ddb61e89b8dfee57a2a4e6c3331a0737f1f290
Auto-generated-cl: translation import
2013-05-01 10:43:33 -07:00
Baligh Uddin
e3eb601dc2
Import translations. DO NOT MERGE
...
Change-Id: I81f4941adbfc66c70b241062ae75b4740a065a08
Auto-generated-cl: translation import
2013-04-30 00:42:26 -07:00
Amith Yamasani
f162efee89
Prompt to set a screen lock when adding a restricted profile
...
Bug: 8735493
If there's no screen lock, prompt to take the user to set a lock.
On return, check if user set the screen lock. If so, add the restricted
profile, otherwise don't add it.
Fix a small layout issue: Bug: 8721209
Change-Id: I2a18fea50a1d810d6a7fa82038b460ca4e03d5a0
2013-04-29 14:10:06 -07:00
Amith Yamasani
b017171587
Three kinds of owner info - owner, user and profile
...
Bug: 8736733
Put the summary "Restricted profile" under the user name in app restrictions panel.
Bug: 8736734
Change-Id: I6b724bd10a9246eb57831bffb737a48c01e0c285
2013-04-28 22:13:22 -07:00
Amith Yamasani
c5b036571e
Merge "Save app toggle state as soon as possible" into jb-mr2-dev
2013-04-28 04:58:54 +00:00
Amith Yamasani
7b56d115ba
Save app toggle state as soon as possible
...
Delaying applying the states till onPause() sometimes results in the apps
disappearing slowly as the new user is booting up, causing failed queued up
broadcasts that result in crash dialogs. This happens mainly when the user
switch is initiated via QuickSettings->LockScreen->Switch while the App
restrictions screen is still showing. The onPause() gets called when
SetupWizard actually takes focus, which is quite late, as boot completed
and other events have already been queued.
Apply the initial toggles right away and apply any user changes when primary
is going to background, or onPause(), whichever comes first.
Bug: 8685927
Also ensure that apps with restrictions get a chance to persist their defaults
as soon as they are toggled on. The user may never actually click on the settings
icon for the app (which was the only way they were getting persisted before).
Some new strings for an upcoming change.
Change-Id: I96f453d066a91c6b15eafe9a6ce3f42d98bf5e33
2013-04-26 15:18:33 -07:00
Svetoslav
4b43e21c64
Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev
2013-04-26 22:14:47 +00:00
Svetoslav
3b2d307b89
Scroll if an accessibility setting description does not fit the screen.
...
1. Certain accessibility settings are shown on a separate screen with
a toggle switch and a description. Sometimes the description does not
fit the screen. The preference framework is using a list view for
holding the description item. This list view was disabled, thus not
scrolling (done to avoid drawable state change on click). Now the
list view is enabled and the drawable state change on click problem
is solved by setting the selector and divider drawables to a
transparent one.
2. The layout for the list item that shows the feature description had
an unnecessary linear layout.
bug:8632146
Change-Id: Ib81a8513158d5b8d90fa80f57720c8590022ae1a
2013-04-26 12:36:00 -07:00
Baligh Uddin
a69b41bb18
Import translations. DO NOT MERGE
...
Change-Id: I902e886b71e60da9c34d682a8b7c4f2453c06375
Auto-generated-cl: translation import
2013-04-26 10:52:46 -07:00
Baligh Uddin
86ef1a5d76
Import translations. DO NOT MERGE
...
Change-Id: Iad94d22f497a67893855012a0732678f25f8e50d
Auto-generated-cl: translation import
2013-04-25 12:05:11 -07:00
Amith Yamasani
868acab2a0
Merge "Rename limited users to restricted profiles" into jb-mr2-dev
2013-04-24 21:54:16 +00:00
Amith Yamasani
8e6f99e22b
Rename limited users to restricted profiles
...
Bug: 8705996
Change-Id: Ibf6a2e0e14ce095758fb9be982710b584b76f15d
2013-04-24 14:21:06 -07:00
Maggie Benthall
8bce7c37d0
Merge "UI compliance for WifiSettings" into jb-mr2-dev
2013-04-24 19:58:24 +00:00