Amith Yamasani
a2563d103b
Increase string lengths for localization.
...
Bug: 10287242
Bug: 10282460
Change-Id: Idf867cde3d22446f1a1ce3d4aacbf1d1607a5eb7
2013-09-11 10:19:53 -07:00
Amith Yamasani
140ede5aaf
am e63450d0
: am 37922a16
: Merge "Fix profile picture picking for restricted profiles" into klp-dev
...
* commit 'e63450d02e9617b2d52c8440f18ac60524fecbf4':
Fix profile picture picking for restricted profiles
2013-09-11 10:11:48 -07:00
Amith Yamasani
e63450d02e
am 37922a16
: Merge "Fix profile picture picking for restricted profiles" into klp-dev
...
* commit '37922a16d35526b0a118484c91ce6f8f58c45ce1':
Fix profile picture picking for restricted profiles
2013-09-11 10:06:28 -07:00
Amith Yamasani
37922a16d3
Merge "Fix profile picture picking for restricted profiles" into klp-dev
2013-09-11 17:03:55 +00:00
The Android Automerger
cef0a9c375
merge in klp-release history after reset to klp-dev
2013-09-11 06:01:17 -07:00
Martijn Coenen
da6c0ba382
HCE: Latest UX and strings.
...
Bug: 10262585
Change-Id: I5473c4d387fed884faf77c7448fab1332f710557
2013-09-11 12:30:46 +02:00
Amith Yamasani
2ad9625462
Fix profile picture picking for restricted profiles
...
Due to the new file picker UI and incorrect assumptions of access to sd card,
have to use content provider Uris instead of file paths.
Also makes the cropping robust in the event of not having a cropping intent
on the platform.
This should make the code play well with third party image
and camera apps as well.
Bug: 10666584
Change-Id: Ie8d834fe7aac96bc14829a7be084512a15ef4001
2013-09-10 17:16:12 -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
The Android Automerger
555d00c5b8
merge in klp-release history after reset to klp-dev
2013-09-10 14:29:09 -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
Przemyslaw Szczepaniak
989adc00dd
am 7d51da80
: am eb306b4c
: Fix for empty "Listen to an example" string.
...
* commit '7d51da8057c38e1fab463410bfcb6239c8c37b4c':
Fix for empty "Listen to an example" string.
2013-09-10 03:20:09 -07:00
Przemyslaw Szczepaniak
7d51da8057
am eb306b4c
: Fix for empty "Listen to an example" string.
...
* commit 'eb306b4c15d721c69255f02497d2bcebff0c265f':
Fix for empty "Listen to an example" string.
2013-09-10 03:19:12 -07:00
Przemyslaw Szczepaniak
eb306b4c15
Fix for empty "Listen to an example" string.
...
Because of bug in previous TTS related change (bugfix for hiding
"Play TTS sample" if default language is not supported), settings
stopped to call getSampleText() when it was established that current
default language is supported.
This change makes sure that getSampleText() is always called if language
is supported.
Bug: 10672535
Change-Id: I83bf7056e12ddbe2322b6a3f04552802037626aa
2013-09-10 10:35:57 +01:00
Baligh Uddin
d84f4b737a
am 97b1f619
: (-s ours) am c184ed76
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '97b1f619588f5def6bd0b78ba5b60d57e8d95d23':
Import translations. DO NOT MERGE
2013-09-09 22:15:53 -07:00
Baligh Uddin
97b1f61958
am c184ed76
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'c184ed7683f3d56ca545ac91c15c747f5460addc':
Import translations. DO NOT MERGE
2013-09-09 22:13:17 -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
Russell Brenner
ac72a3dfd3
Merge "Limit wifi password to ascii chars" into klp-dev
2013-09-10 01:11:43 +00:00
Amith Yamasani
d87794187b
am 42c020ef
: am 329e5b15
: Merge "Fix NPE for stability tests" into klp-dev
...
* commit '42c020ef51ababcd8bb6a1f42bd2fbe759f44eac':
Fix NPE for stability tests
2013-09-09 14:29:11 -07:00
Dianne Hackborn
3e0495eec5
am b2a4a735
: am d90ff677
: Merge "Follow-on for #10671878 : Proc stats needs to remove old data structures" into klp-dev
...
* commit 'b2a4a735e20a8f4c02a7205cb5da23ef0021fcef':
Follow-on for #10671878 : Proc stats needs to remove old data structures
2013-09-09 14:29:10 -07:00
Tom O'Neill
59b29c7dde
am 0bd29674
: am b23c86dd
: Merge "Specify user when starting service" into klp-dev
...
* commit '0bd296742473bb4c5ed7150cea05c25817b36b80':
Specify user when starting service
2013-09-09 14:29:10 -07:00
Amith Yamasani
42c020ef51
am 329e5b15
: Merge "Fix NPE for stability tests" into klp-dev
...
* commit '329e5b159a559791c41fbf401cf1af5063caf1cf':
Fix NPE for stability tests
2013-09-09 14:25:26 -07:00
Dianne Hackborn
b2a4a735e2
am d90ff677
: Merge "Follow-on for #10671878 : Proc stats needs to remove old data structures" into klp-dev
...
* commit 'd90ff6772b9b21e6c2e6a0bfa616bd612c6bc849':
Follow-on for #10671878 : Proc stats needs to remove old data structures
2013-09-09 14:25:12 -07:00
Tom O'Neill
0bd2967424
am b23c86dd
: Merge "Specify user when starting service" into klp-dev
...
* commit 'b23c86dd2ec48387f099749673df75cc332761e5':
Specify user when starting service
2013-09-09 14:25:11 -07:00
Amith Yamasani
329e5b159a
Merge "Fix NPE for stability tests" into klp-dev
2013-09-09 21:19:02 +00:00
Dianne Hackborn
d90ff6772b
Merge "Follow-on for #10671878 : Proc stats needs to remove old data structures" into klp-dev
2013-09-09 20:37:26 +00: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
Amith Yamasani
5334cf609f
Fix NPE for stability tests
...
Bug: 9882651
Change-Id: I4164764a058d68d448ef4a4aba2a18f072079b9c
2013-09-09 13:16:00 -07:00
Tom O'Neill
b23c86dd2e
Merge "Specify user when starting service" into klp-dev
2013-09-09 20:04:27 +00:00
Lifu Tang
242e670f32
am c75a2c58
: am d1253a2b
: Merge "Revert "Dim icons when recent apps category is disabled"" into klp-dev
...
* commit 'c75a2c58d85163cadb4d8b8582ebd81c2c9ecc68':
Revert "Dim icons when recent apps category is disabled"
2013-09-09 10:48:23 -07:00
Lifu Tang
c75a2c58d8
am d1253a2b
: Merge "Revert "Dim icons when recent apps category is disabled"" into klp-dev
...
* commit 'd1253a2b435c17513a397eee3350f737df7a1d8f':
Revert "Dim icons when recent apps category is disabled"
2013-09-09 10:44:41 -07:00
Lifu Tang
d1253a2b43
Merge "Revert "Dim icons when recent apps category is disabled"" into klp-dev
2013-09-09 17:40:24 +00:00
Tom O'Neill
7f91d86283
Specify user when starting service
...
- Improve logging
- Fix b/10621831
Change-Id: Icbb265ce53640dcf63f1c81d682f5811f196efcc
2013-09-09 10:33:52 -07:00
Russell Brenner
e094f60f1c
Limit wifi password to ascii chars
...
Bug: 10441448
Change-Id: I7a77a8f594dbe0ef4df60db9b26167b8f17bf8b2
2013-09-09 10:13:47 -07:00
Dianne Hackborn
04436c51f6
Follow-on for #10671878 : Proc stats needs to remove old data structures
...
The UI can now show better information about services, now that we
have the name of the process each service runs in and its total run
time.
Change-Id: I0777d8295a50c8f69c57bad24ccafe3bf0fbe5b8
2013-09-09 09:51:34 -07:00
The Android Automerger
50ad72511c
merge in klp-release history after reset to klp-dev
2013-09-09 06:02:37 -07:00
Lifu Tang
332822e31b
Revert "Dim icons when recent apps category is disabled"
...
This change makes all the icons in the system dimmed, not only on Location Settings page. I haven't managed to find a simple fix to that problem. I think we should abandon this feature, and revert this CL.
This reverts commit ebcd196a0b
.
Change-Id: If39f2892c82643b936d2d9ff7b1d1c027018f3f6
2013-09-09 00:06:34 +00:00
Lifu Tang
033899161e
am e13049b0
: am 5999658e
: Merge "Dim icons when recent apps category is disabled" into klp-dev
...
* commit 'e13049b04a62212f8d47a822350a165ff9a76a2a':
Dim icons when recent apps category is disabled
2013-09-07 22:15:58 -07:00
Lifu Tang
e13049b04a
am 5999658e
: Merge "Dim icons when recent apps category is disabled" into klp-dev
...
* commit '5999658ef8e5ae0e1e148cca8ab8ab90813902ba':
Dim icons when recent apps category is disabled
2013-09-07 22:14:11 -07:00
Lifu Tang
5999658ef8
Merge "Dim icons when recent apps category is disabled" into klp-dev
2013-09-08 05:12:00 +00:00