Commit Graph

12170 Commits

Author SHA1 Message Date
Jeff Sharkey
457284e858 am 8cd39351: am bd5cbb04: am fd845410: Merge "remove primary condition check on storage format." into klp-dev
* commit '8cd39351fe9d1164a06bb4420e2b95c5dd9259fb':
  remove primary condition check on storage format.
2013-10-25 16:14:01 -07:00
Jeff Sharkey
8cd39351fe am bd5cbb04: am fd845410: Merge "remove primary condition check on storage format." into klp-dev
* commit 'bd5cbb0400366faade3586e19f1deae2350c0ddd':
  remove primary condition check on storage format.
2013-10-25 15:06:12 -07:00
Jeff Sharkey
bd5cbb0400 am fd845410: Merge "remove primary condition check on storage format." into klp-dev
* commit 'fd845410aa3b5b572e2d72bd7d97fb5b112fa3fd':
  remove primary condition check on storage format.
2013-10-25 15:02:50 -07:00
Jeff Sharkey
fd845410aa Merge "remove primary condition check on storage format." into klp-dev 2013-10-25 22:00:07 +00:00
Pierre
93df01e3a7 remove primary condition check on storage format.
this change seemed to have been introduced originally
via commit d2a6f28fa7
as a workaround to fix interoperability problem with MTP,
then commit 8218d3ba18
seemed to have address this problem.

therefore it looks like removing the original restriction
is in order to allow formating of the sd-card when not
primary storage.

Bug: 11352632
Change-Id: I0419135a607dac08c44a3f30a7ccdcad17c46437
Signed-off-by: Pierre <pierre@broadcom.com>
2013-10-25 13:12:28 -07:00
Andrew Flynn
d1808bd6c8 Merge "Check for presence of carrier app in Mobile Plan." 2013-10-25 19:55:22 +00:00
Baligh Uddin
02b6a47df8 am c42d3174: (-s ours) am 0728400a: (-s ours) am 9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c42d3174675ba909df526af3daec07bbc83c94df':
  Import translations. DO NOT MERGE
2013-10-25 12:26:39 -07:00
Baligh Uddin
c42d317467 am 0728400a: (-s ours) am 9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '0728400a7943303b26d0f60e52050dc1fb496c68':
  Import translations. DO NOT MERGE
2013-10-25 12:25:00 -07:00
Baligh Uddin
0728400a79 am 9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '9271875c129d000a98a7a1fcd11f09041f26455c':
  Import translations. DO NOT MERGE
2013-10-25 12:22:49 -07:00
Baligh Uddin
9271875c12 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-25 19:21:06 +00:00
Baligh Uddin
144cdee03c Import translations. DO NOT MERGE
Change-Id: If2ea17bb82d79c6a722bfa2360db9dbee83d008d
Auto-generated-cl: translation import
2013-10-25 11:40:25 -07:00
Zhihai Xu
5e0b5bd100 am f8ac9d60: am c9c92647: am cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
* commit 'f8ac9d60d4da1a467e02b658d08f3d140f074390':
  need persist adding bluetooth MAP profile to profile list in case the settings process being killed
2013-10-25 11:19:37 -07:00
Zhihai Xu
f8ac9d60d4 am c9c92647: am cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
* commit 'c9c92647d1ab0f75c9f7a499e05fd556c96fa128':
  need persist adding bluetooth MAP profile to profile list in case the settings process being killed
2013-10-25 11:17:15 -07:00
Zhihai Xu
c9c92647d1 am cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
* commit 'cb9d32e55f68446a3e696b0bd9f553f7d5d14dc4':
  need persist adding bluetooth MAP profile to profile list in case the settings process being killed
2013-10-25 11:15:55 -07:00
Zhihai Xu
cb9d32e55f Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev 2013-10-25 18:12:48 +00:00
Wink Saville
64217355be am b557b89c: am 01b7ae29: am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit 'b557b89c4dde4c760b1ce7c6317d3077378692e0':
  Display remaining attempts when using or changing SIM PIN
2013-10-25 09:54:35 -07:00
Wink Saville
b557b89c4d am 01b7ae29: am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit '01b7ae29600f934d491cdc6dafdacf22821baf8d':
  Display remaining attempts when using or changing SIM PIN
2013-10-25 09:49:34 -07:00
Wink Saville
01b7ae2960 am 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
* commit '83671ff815f59a977b34297c94aa05b4b4e97d01':
  Display remaining attempts when using or changing SIM PIN
2013-10-25 09:46:29 -07:00
Wink Saville
83671ff815 Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev 2013-10-25 16:41:09 +00:00
Baligh Uddin
c70aac671a am acc23ef6: (-s ours) am 315e78bd: (-s ours) am 2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'acc23ef6995a567e3d14f827940748af2e439025':
  Import translations. DO NOT MERGE
2013-10-23 20:39:58 -07:00
Baligh Uddin
acc23ef699 am 315e78bd: (-s ours) am 2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '315e78bd4d033e777426a46952a752d724278f18':
  Import translations. DO NOT MERGE
2013-10-23 20:38:22 -07:00
Baligh Uddin
315e78bd4d am 2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2ba4985526779a52826b933597b7817952e1d0a0':
  Import translations. DO NOT MERGE
2013-10-23 20:35:30 -07:00
Baligh Uddin
81f96c6b43 Merge "Import translations. DO NOT MERGE" 2013-10-24 03:33:39 +00:00
Baligh Uddin
2ba4985526 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-24 03:33:34 +00:00
Baligh Uddin
9e8b20b73e Import translations. DO NOT MERGE
Change-Id: I654010b903a3b8bb4cec6a288250380bd93070e0
Auto-generated-cl: translation import
2013-10-23 19:54:57 -07:00
Baligh Uddin
855d40a569 Import translations. DO NOT MERGE
Change-Id: Iea5d9695008ddc258cfead84f2494fb3111eefea
Auto-generated-cl: translation import
2013-10-23 19:50:57 -07:00
Wink Saville
8246579fa1 Display remaining attempts when using or changing SIM PIN
Bug: 9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08
2013-10-23 17:07:10 -07:00
Vineeta Srivastava
7531e1b153 am 4a66909a: am 7a40def1: am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '4a66909a6aae9d35ebc13fb377a41e525bd0f6c9':
  Remove Manage Mobile Plan when config_show_mobile_plan is set to false
2013-10-23 16:17:13 -07:00
John Spurlock
ab44400e45 am d947e49b: am ada38ffa: am 311a7845: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev
* commit 'd947e49b02ba7d8d47263b94893d85067ae0c3ad':
  Inherit translucent bars in keyguard widget picker.
2013-10-23 16:17:12 -07:00
Vineeta Srivastava
4a66909a6a am 7a40def1: am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '7a40def17c40279faf8ad01d730c88498cd2f549':
  Remove Manage Mobile Plan when config_show_mobile_plan is set to false
2013-10-23 16:14:35 -07:00
John Spurlock
d947e49b02 am ada38ffa: am 311a7845: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev
* commit 'ada38ffa3b8dca416a169d57061d2b1bdfc0cfdc':
  Inherit translucent bars in keyguard widget picker.
2013-10-23 16:14:35 -07:00
Vineeta Srivastava
7a40def17c am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '479634248d2c9833d7315a6382f491460f48da0f':
  Remove Manage Mobile Plan when config_show_mobile_plan is set to false
2013-10-23 16:11:45 -07:00
John Spurlock
ada38ffa3b am 311a7845: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev
* commit '311a78455a75955b53412abcd0c41872e20f686e':
  Inherit translucent bars in keyguard widget picker.
2013-10-23 16:11:44 -07:00
Vineeta Srivastava
479634248d Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev 2013-10-23 23:09:48 +00:00
Sungmin Choi
2490315e49 Remove Manage Mobile Plan when config_show_mobile_plan is set to false
config_show_mobile_plan is set to true by default.
When you don't want to show "Manage mobile plan" set config_show_mobile_plan to false in overlay.

Bug: 10819853
Change-Id: Ic3c69fb4246cc0de38518ef6c9950cee7fa4d987
2013-10-23 21:29:14 +00:00
John Spurlock
311a78455a Merge "Inherit translucent bars in keyguard widget picker." into klp-dev 2013-10-23 15:47:53 +00:00
John Spurlock
daace3fa2e Inherit translucent bars in keyguard widget picker.
Bug:11337231
Change-Id: Ie65d5474328cec859637ba7771da5e93509236ae
2013-10-22 16:12:58 -04:00
Baligh Uddin
054cdcbd65 am b57eee78: (-s ours) am 5dd4a096: (-s ours) am 7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'b57eee78248f02ac483daaeaa75248ecab9ecfd6':
  Import translations. DO NOT MERGE
2013-10-22 13:05:41 -07:00
Baligh Uddin
b57eee7824 am 5dd4a096: (-s ours) am 7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5dd4a09679b373927f459a9daccd4ba87badb366':
  Import translations. DO NOT MERGE
2013-10-22 13:03:32 -07:00
Baligh Uddin
5dd4a09679 am 7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '7fe57374cdb67b19b98d0170e10add876f0823b1':
  Import translations. DO NOT MERGE
2013-10-22 13:00:31 -07:00
Baligh Uddin
351a3dce1e Merge "Import translations. DO NOT MERGE" 2013-10-22 19:54:15 +00:00
Baligh Uddin
7fe57374cd Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-22 19:54:11 +00:00
Lifu Tang
f31559601c am 7077e646: am 75099b67: am cace3d8d: Modified the strings according to the specs
* commit '7077e6460e393e567d3b80da6190ff1ebe7d834a':
  Modified the strings according to the specs
2013-10-21 16:06:09 -07:00
Lifu Tang
7077e6460e am 75099b67: am cace3d8d: Modified the strings according to the specs
* commit '75099b672338213e9f74462cd9ff96dd51bdd9d5':
  Modified the strings according to the specs
2013-10-21 16:03:20 -07:00
Lifu Tang
75099b6723 am cace3d8d: Modified the strings according to the specs
* commit 'cace3d8d28f005e6226a3eb909f8ebc3668ef805':
  Modified the strings according to the specs
2013-10-21 16:00:32 -07:00
Baligh Uddin
393798c73d Import translations. DO NOT MERGE
Change-Id: Ie22a6c9bff23e69d4ed2fbf21c92cea4283797fe
Auto-generated-cl: translation import
2013-10-21 11:08:18 -07:00
Baligh Uddin
0e036f24af Import translations. DO NOT MERGE
Change-Id: Ic7fb5ee337d953a38cd86957054f550aa4ccc88c
Auto-generated-cl: translation import
2013-10-21 11:04:20 -07:00
Zhihai Xu
1b5bd091eb need persist adding bluetooth MAP profile to profile list in case the settings process being killed
bug:11303213
Change-Id: I1f227839931872ba6fdca0b5932a24e0b002ec44
2013-10-19 23:37:35 -07:00
Lifu Tang
cace3d8d28 Modified the strings according to the specs
- Fix b/11290711

Change-Id: I23827ad5bef4cf4bda14bb08f0e502cc4e9d2727
2013-10-18 17:49:47 -07:00
Zhihai Xu
21d9dced4a am ce62f3ef: am 592ed214: am 55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit 'ce62f3efc05fe515a93cc6c368eb37be6a8657c1':
  BT keeps on asking me if I want to allow car to do stuff
2013-10-18 11:57:56 -07:00