Commit Graph

11620 Commits

Author SHA1 Message Date
Jason Monk
c85359ef11 am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
* commit '4e42c80872e3543247913afd270fe5b9950b2969':
  Add PAC UI to Wi-Fi Settings
2013-11-05 18:22:58 -08:00
Jason Monk
4e42c80872 Merge "Add PAC UI to Wi-Fi Settings" into klp-dev 2013-11-06 02:20:50 +00:00
Baligh Uddin
e202393f79 am 1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '1bfd35410db22b1f4aabe4ad3f471bedb088584d':
  Import translations. DO NOT MERGE
2013-11-05 15:15:23 -08:00
Baligh Uddin
1bfd35410d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-05 23:12:13 +00:00
Amith Yamasani
f7f6e4bfc6 am 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
* commit '060d5fd1727b087094e295481b2633deb33a6616':
  Adjust power control widget minWidth to occupy 4 cells.
2013-11-05 13:54:00 -08:00
Amith Yamasani
060d5fd172 Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev 2013-11-05 21:51:43 +00:00
Jason Monk
070f3560d5 Add PAC UI to Wi-Fi Settings
Now when a PAC URL is set it shows it in settings rather than the proxy
spinner set to None.  This should only be visible in EDU users as only EDU
has PAC.

Bug: 11528608
Change-Id: Ie4bad8ea935f0a8f1bb7877eb2be146e06d71c2d
2013-11-05 14:39:44 -05:00
Kenny Root
18964c9063 am 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev
* commit '8cc60da4c91c38f7f37561ff3bbb128dcb7456d8':
  Accessibility: filter touches to Enable button
2013-11-04 16:16:08 -08:00
Kenny Root
8cc60da4c9 Merge "Accessibility: filter touches to Enable button" into klp-dev 2013-11-05 00:12:19 +00:00
Baligh Uddin
734def9d81 Import translations. DO NOT MERGE
Change-Id: Ibae16129afb209250dddbfa8415fc2c780703a94
Auto-generated-cl: translation import
2013-11-04 15:23:56 -08:00
Amith Yamasani
49f9a444f3 Adjust power control widget minWidth to occupy 4 cells.
Bug: 10561000
Change-Id: I9a4312d956581059ea43077c5228e43e2bd1c7a5
2013-11-01 17:17:08 -07:00
Baligh Uddin
8fe316cad4 am e2b0278f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'e2b0278fa3ce9f04fdaa3ce690b8e1581a0dbe13':
  Import translations. DO NOT MERGE
2013-11-01 07:47:57 -07:00
Baligh Uddin
e2b0278fa3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-01 14:46:21 +00:00
Satoshi Kataoka
2cab134403 am aa4fa0ea: Fix a bug on updating enabled IMEs
* commit 'aa4fa0ea0950ecd61af64a6bdeea109cfed64362':
  Fix a bug on updating enabled IMEs
2013-10-31 15:07:11 -07:00
Satoshi Kataoka
aa4fa0ea09 Fix a bug on updating enabled IMEs
Bug: 11354619
Change-Id: Ie33630b3dc150536bc0325ad6116ea5fdcf60740
2013-11-01 07:00:13 +09:00
Baligh Uddin
ac093063b0 Import translations. DO NOT MERGE
Change-Id: Ie376be991f9d022ac5b4f066c7946d44d4175c2e
Auto-generated-cl: translation import
2013-10-30 11:23:02 -07:00
Chris Wren
455bf4d339 am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
* commit '1630ef4fc5f4131d7d7ef823ba5afba3b5b3fa72':
  remove lockscreen widget checkbox when there's no lockscreen.
2013-10-29 11:59:53 -07:00
Chris Wren
1630ef4fc5 remove lockscreen widget checkbox when there's no lockscreen.
Bug: 11190345
Change-Id: I1b48e7a6a70226b103d8a6a27bd3374ff8349b3f
2013-10-29 13:42:05 -04:00
Baligh Uddin
317352151b am b9687f3b: (-s ours) Import translations. DO NOT MERGE
* commit 'b9687f3b4ef392dbeddeeeb9de9e0b5e51f44a2f':
  Import translations. DO NOT MERGE
2013-10-28 20:44:53 -07:00
Baligh Uddin
b9687f3b4e Import translations. DO NOT MERGE
Change-Id: I9f5f19d06f849f0142b1667c74d3d2456ad6fe27
Auto-generated-cl: translation import
2013-10-28 15:19:24 -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
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
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
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
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
2ba4985526 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-24 03:33:34 +00: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
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
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
7fe57374cd Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-22 19:54:11 +00: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
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
592ed21459 am 55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '55f03857b7ebe7663cf4873d059afced15e30081':
  BT keeps on asking me if I want to allow car to do stuff
2013-10-18 11:54:03 -07:00
Zhihai Xu
55f03857b7 Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 2013-10-18 18:51:16 +00:00
Satoshi Kataoka
56f47bf11b am ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume
* commit 'ea90cd2fca08e5c65e54d8df1c208337e08fc541':
  Do not merge. Refresh "InputMethodPreference"s onResume
2013-10-18 11:18:29 -07:00
Satoshi Kataoka
ea90cd2fca Do not merge. Refresh "InputMethodPreference"s onResume
Corresponding change is I015075d57ebed94d6b

Bug: 11245599
Change-Id: I8be2b9a81d41fab979afe000bd1bce6fc57550c7
2013-10-18 18:55:07 +09:00