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
David Braun
79c6977e4d
am b6a3133d
: am e9aa0a94
: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
...
* commit 'b6a3133d6ed69279d1776f670b5935010830753c':
Factor out read/write SMS settings seperate from send/receive.
2013-09-10 13:38:13 -07:00
David Braun
b6a3133d6e
am e9aa0a94
: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
...
* commit 'e9aa0a94d0572101dd580bcc48e23b96e6c6cb71':
Factor out read/write SMS settings seperate from send/receive.
2013-09-10 13:35:43 -07:00
David Braun
e9aa0a94d0
Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
2013-09-10 20:33:41 +00:00
David Braun
4f648c2912
Factor out read/write SMS settings seperate from send/receive.
...
Change-Id: I88177c23d165df6c00a8d32203f3a5b18aca1dcf
2013-09-10 13:14:09 -07:00
Baligh Uddin
e578b1cdf5
Merge "Import translations. DO NOT MERGE"
2013-09-10 05:09:04 +00:00
Baligh Uddin
c184ed7683
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-10 05:09:00 +00:00
Jeff Sharkey
69f5a7e046
am ffb9258b
: am 75c4204e
: Merge "Remove sdcard developer option, avoid data crash." into klp-dev
...
* commit 'ffb9258b85b894377bef59a08d3466a6d0d12406':
Remove sdcard developer option, avoid data crash.
2013-09-09 21:48:48 -07:00
Jeff Sharkey
ffb9258b85
am 75c4204e
: Merge "Remove sdcard developer option, avoid data crash." into klp-dev
...
* commit '75c4204e8ab154d860824abfec965a8c62f10d77':
Remove sdcard developer option, avoid data crash.
2013-09-09 21:46:19 -07:00
Jeff Sharkey
75c4204e8a
Merge "Remove sdcard developer option, avoid data crash." into klp-dev
2013-09-10 04:41:19 +00:00
Jeff Sharkey
78ff1b8f10
Remove sdcard developer option, avoid data crash.
...
Remove READ_EXTERNAL_STORAGE enforcement UI, since the permission is
now always enforced. Check to see if bandwidth module is enabled
when launching data usage, and finish gracefully if disabled.
Bug: 10116515, 10392597
Change-Id: Id0295c405b780a53867934b3bcd0a5f56db7d87a
2013-09-09 18:42:33 -07:00
Russell Brenner
03d61aff62
am 4d92f098
: am ac72a3df
: Merge "Limit wifi password to ascii chars" into klp-dev
...
* commit '4d92f098d063f4922d48cc7f0205d0fced03321b':
Limit wifi password to ascii chars
2013-09-09 18:18:37 -07:00
Russell Brenner
4d92f098d0
am ac72a3df
: Merge "Limit wifi password to ascii chars" into klp-dev
...
* commit 'ac72a3dfd3069c39e3605a9f5f114efb19059ded':
Limit wifi password to ascii chars
2013-09-09 18:15:57 -07:00
Baligh Uddin
73f6f1bfd1
Import translations. DO NOT MERGE
...
Change-Id: I58db88d216a60723598c41e786cbfcfc972d0dfe
Auto-generated-cl: translation import
2013-09-09 13:34:45 -07:00
Baligh Uddin
e10fd7afa2
Import translations. DO NOT MERGE
...
Change-Id: I69705cf113c1288bad878c5b06b5519df8df92d6
Auto-generated-cl: translation import
2013-09-09 13:27:39 -07:00
Russell Brenner
e094f60f1c
Limit wifi password to ascii chars
...
Bug: 10441448
Change-Id: I7a77a8f594dbe0ef4df60db9b26167b8f17bf8b2
2013-09-09 10:13:47 -07:00
Svetoslav Ganov
00457ee68d
am 3a67c5e3
: am 1e1d5324
: Merge "Print service settings polish" into klp-dev
...
* commit '3a67c5e3b3534176d9b57480b2a9d79b1f8e6ba9':
Print service settings polish
2013-09-07 15:12:51 -07:00
Svetoslav Ganov
3a67c5e3b3
am 1e1d5324
: Merge "Print service settings polish" into klp-dev
...
* commit '1e1d532491ecf10e7fd5791559b5d97be5553ae4':
Print service settings polish
2013-09-07 15:10:35 -07:00
Svetoslav Ganov
1e1d532491
Merge "Print service settings polish" into klp-dev
2013-09-07 22:05:38 +00:00
Svetoslav Ganov
43557570cf
Print service settings polish
...
1. Moved the settings and add printers to the overflow menu.
2. Collapsing the search action view to get proper behavior when selected.
3. Showing the search option only if there are printers.
4. Stop observing for printers if the service is disabled.
bug:10652301
Change-Id: I589a3b177c5a58a8b1382d7020fd4b128afd9038
2013-09-06 14:57:51 -07:00
Fabrice Di Meglio
9e8765f186
am f37120b9
: am 4c7de613
: Merge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev
...
* commit 'f37120b9983fc73fd7ddfc9e93517ed6ac9023a2':
Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings
2013-09-06 13:46:42 -07:00
Fabrice Di Meglio
f37120b998
am 4c7de613
: Merge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev
...
* commit '4c7de61320f3ea1df8d5cdd3d0645830b67722ea':
Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings
2013-09-06 13:38:45 -07:00
Fabrice Di Meglio
4c7de61320
Merge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev
2013-09-06 20:05:18 +00:00
Fabrice Di Meglio
37f3c8f574
Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings
...
- well this CL is only for preventing a wrong rendering (the real CL would need to be one latter
and would need to fix the onDraw(Canvas) for LinearColorBar so that it takes care of the layout direction)
- force LTR layout direction on the LinearColorBar, hence preventing the two TextView to render their
text "in the middle".
- use BidiFormatter to wrap number strings
Change-Id: Ie164e5509c0364a81c85a3ac69f97a89f20a4130
2013-09-06 11:19:27 -07:00
Lifu Tang
553c73bfad
am f534039f
: am 0a0635c1
: Merge "Don\'t show explicit time when no recent apps" into klp-dev
...
* commit 'f534039f0cdb595c4d7204ce2b4eead042cf9e4c':
Don't show explicit time when no recent apps
2013-09-06 09:52:06 -07:00
Baligh Uddin
553995204b
Merge "Import translations. DO NOT MERGE"
2013-09-06 03:34:28 +00:00
Baligh Uddin
f1e0c65efb
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-06 03:34:18 +00:00
Lifu Tang
f534039f0c
am 0a0635c1
: Merge "Don\'t show explicit time when no recent apps" into klp-dev
...
* commit '0a0635c10ebf73d8133a7f96d6cae89ea9282dd2':
Don't show explicit time when no recent apps
2013-09-05 19:03:28 -07:00
Lifu Tang
0a0635c10e
Merge "Don't show explicit time when no recent apps" into klp-dev
2013-09-06 02:01:18 +00:00
Lifu Tang
9e5251817e
Don't show explicit time when no recent apps
...
- Partial fix for b/10638903
Change-Id: I38d681c52b3d03cdece48d3cdc027dcbe66bd0f2
2013-09-05 14:50:29 -07:00
Svetoslav Ganov
4d108e4ff9
am e4443058
: am 10cbbc55
: Merge "Print settings polish" into klp-dev
...
* commit 'e44430583a40dfc178924256cc4e6776f9d00701':
Print settings polish
2013-09-05 14:45:11 -07:00
Svetoslav Ganov
e44430583a
am 10cbbc55
: Merge "Print settings polish" into klp-dev
...
* commit '10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7':
Print settings polish
2013-09-05 14:41:35 -07:00
Svetoslav Ganov
10cbbc5515
Merge "Print settings polish" into klp-dev
2013-09-05 21:38:11 +00:00
Baligh Uddin
672c4d06f6
Import translations. DO NOT MERGE
...
Change-Id: I15246270911f331f81c3e621baf82f90335529be
Auto-generated-cl: translation import
2013-09-05 12:52:47 -07:00
Baligh Uddin
d7aea197af
Import translations. DO NOT MERGE
...
Change-Id: I4e3b8d9ebc0a38940b8864bbee841002385f5fb2
Auto-generated-cl: translation import
2013-09-05 12:46:15 -07:00
Svetoslav Ganov
74648ac808
Print settings polish
...
1. Added support for launching the top level print settings.
2. Updated some strings.
3. Removed the uninstall option for a print service.
4. Added search for the list of printers of a print service.
Change-Id: I9e175ba78b2d22b2bf90cf79153dc73327dfaff1
2013-09-05 00:01:40 -07:00
Dianne Hackborn
b70413cdfa
am ec4f5ed1
: am dd600b60
: Merge "Add details screen to proc stats." into klp-dev
...
* commit 'ec4f5ed1a95bd26e68766252f19c407b1479bb83':
Add details screen to proc stats.
2013-09-04 18:36:12 -07:00
Dianne Hackborn
ec4f5ed1a9
am dd600b60
: Merge "Add details screen to proc stats." into klp-dev
...
* commit 'dd600b603d98e28219a9a38a62f2527db05736bb':
Add details screen to proc stats.
2013-09-04 18:31:29 -07:00
Dianne Hackborn
dd600b603d
Merge "Add details screen to proc stats." into klp-dev
2013-09-05 01:26:42 +00:00
Svetoslav
ab5d9fd106
am 8ed62da6
: am f7092bc6
: Merge "Implementing print settings as per UX spec." into klp-dev
...
* commit '8ed62da68b1682245e2c8d093c96a6a3f169679a':
Implementing print settings as per UX spec.
2013-09-04 17:43:48 -07:00
Dianne Hackborn
0448673834
Add details screen to proc stats.
...
Lets you see the actual RAM use and % running time, a list of
all of the services that are associated with it (kind-of, not
working correctly for those that share processes), and most
importantly a glorious FORCE STOP button.
Change-Id: I34ac30c88f1187227a8a7809ae103118c8b9a865
2013-09-04 17:27:30 -07:00
Svetoslav
8ed62da68b
am f7092bc6
: Merge "Implementing print settings as per UX spec." into klp-dev
...
* commit 'f7092bc6bfb16695d73f984d3c2cf557c63a17f1':
Implementing print settings as per UX spec.
2013-09-04 17:20:45 -07:00
Svetoslav
f7092bc6bf
Merge "Implementing print settings as per UX spec." into klp-dev
2013-09-05 00:18:48 +00:00
Chong Zhang
e8b3de4c44
am 4459ca50
: am 35ec3b7f
: Merge "wifi-display: add drop down list for Wps config method" into klp-dev
...
* commit '4459ca503c68edaaba357ce577c5dee0e586b252':
wifi-display: add drop down list for Wps config method
2013-09-04 15:14:34 -07:00
Chong Zhang
4459ca503c
am 35ec3b7f
: Merge "wifi-display: add drop down list for Wps config method" into klp-dev
...
* commit '35ec3b7fa389e9a2ddc131eb3a75b2f3dbc8330e':
wifi-display: add drop down list for Wps config method
2013-09-04 15:11:34 -07:00
Chong Zhang
35ec3b7fa3
Merge "wifi-display: add drop down list for Wps config method" into klp-dev
2013-09-04 22:07:19 +00:00
Svetoslav
2d53165359
Implementing print settings as per UX spec.
...
Change-Id: Iafe99a1e959472f893cf168d952d9dd19ff160c0
2013-09-04 14:40:02 -07:00
Baligh Uddin
ba84f2db48
Merge "Import translations. DO NOT MERGE"
2013-09-04 05:00:14 +00:00
Baligh Uddin
c63e097aa7
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-04 05:00:08 +00:00
Lifu Tang
3c3d03702b
am 1a72ab95
: am f4c4294c
: Merge "Renamed "Location services" to "App settings"" into klp-dev
...
* commit '1a72ab950d64ef4e13180bea78f3c215fb5f9159':
Renamed "Location services" to "App settings"
2013-09-03 17:18:37 -07:00