Alan Viverette
32b83d9b1d
am 6489d6f6
: am 54fa990f
: Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-dev
...
* commit '6489d6f6547f5eb96d9a675ba68fa241ab699b42':
Fix manifest entry for CAPTIONING_SETTINGS action
2013-09-12 11:29:05 -07:00
Alan Viverette
6489d6f654
am 54fa990f
: Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-dev
...
* commit '54fa990f6174542e1e7fbe77a75954fcd2f39983':
Fix manifest entry for CAPTIONING_SETTINGS action
2013-09-12 11:26:22 -07:00
Alan Viverette
54fa990f61
Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-dev
2013-09-12 18:23:34 +00:00
Amith Yamasani
324bdf9329
am 32aa0bfd
: am ad541608
: am ad0f0edb
: Merge "Call to equals() comparing different types"
...
* commit '32aa0bfdd5984970e22da9676c5f59cc0bf9203e':
Call to equals() comparing different types
2013-09-12 10:01:02 -07:00
Amith Yamasani
32aa0bfdd5
am ad541608
: am ad0f0edb
: Merge "Call to equals() comparing different types"
...
* commit 'ad54160844177515dfe9024521669e4b47311d0f':
Call to equals() comparing different types
2013-09-12 09:49:54 -07:00
Baligh Uddin
510ae6b64a
am 3117b930
: (-s ours) am 1ab0933a
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '3117b93015ae35c20613c1647096033fb323395d':
Import translations. DO NOT MERGE
2013-09-12 09:21:58 -07:00
Amith Yamasani
ad54160844
am ad0f0edb
: Merge "Call to equals() comparing different types"
...
* commit 'ad0f0edb54fd61048b64053d7eb8fafa6c84b119':
Call to equals() comparing different types
2013-09-12 09:21:53 -07:00
Baligh Uddin
3117b93015
am 1ab0933a
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '1ab0933a6dbc4cb3df16b90bc730509ed4162721':
Import translations. DO NOT MERGE
2013-09-12 09:12:46 -07:00
Amith Yamasani
ad0f0edb54
Merge "Call to equals() comparing different types"
2013-09-12 16:08:20 +00:00
Baligh Uddin
bf7f933180
Merge "Import translations. DO NOT MERGE"
2013-09-12 03:14:12 +00:00
Baligh Uddin
1ab0933a6d
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-12 03:13:57 +00:00
Amith Yamasani
04dcd82e1e
am b57ebd8b
: am 6cd9a67a
: Merge "Increase string lengths for localization." into klp-dev
...
* commit 'b57ebd8bc9e2aed841a881ec79d9b55cee9f0928':
Increase string lengths for localization.
2013-09-11 16:49:16 -07:00
Martijn Coenen
e317b32f8d
am 18c71a91
: am 52df3343
: Merge "HCE: Latest UX and strings." into klp-dev
...
* commit '18c71a91c23523c0b1950397b3c12072c8fecc1f':
HCE: Latest UX and strings.
2013-09-11 16:49:15 -07:00
Baligh Uddin
571d2129ff
Import translations. DO NOT MERGE
...
Change-Id: I97b69c524b4f1894353a0ea1d5851920ca4558b8
Auto-generated-cl: translation import
2013-09-11 15:40:07 -07:00
Baligh Uddin
f2aa7685d0
Import translations. DO NOT MERGE
...
Change-Id: I1cb0e4fdcb057eccc90535d148a38f4149e88419
Auto-generated-cl: translation import
2013-09-11 15:33:39 -07:00
Alan Viverette
9b625f0baa
Fix manifest entry for CAPTIONING_SETTINGS action
...
BUG: 10708261
Change-Id: I54cfd8eaae97ed3da165521b9b4e73924bd3f0e1
2013-09-11 13:03:14 -07:00
Amith Yamasani
b57ebd8bc9
am 6cd9a67a
: Merge "Increase string lengths for localization." into klp-dev
...
* commit '6cd9a67a5463ef97044fa1919b6317276eb8af5f':
Increase string lengths for localization.
2013-09-11 10:58:27 -07:00
Amith Yamasani
6cd9a67a54
Merge "Increase string lengths for localization." into klp-dev
2013-09-11 17:54:53 +00:00
Martijn Coenen
18c71a91c2
am 52df3343
: Merge "HCE: Latest UX and strings." into klp-dev
...
* commit '52df3343ab471b9fcc8773ea7bcb88edb2523896':
HCE: Latest UX and strings.
2013-09-11 10:54:52 -07:00
Martijn Coenen
52df3343ab
Merge "HCE: Latest UX and strings." into klp-dev
2013-09-11 17:52:36 +00:00
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
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
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