OSDN Git Service

android-x86/packages-apps-Settings.git
10 years agoam 58f53f9c: am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into...
Jason Monk [Wed, 6 Nov 2013 02:59:11 +0000 (18:59 -0800)]
am 58f53f9c: am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev

* commit '58f53f9c351329bf51bb548409c047e024d94fc4':
  Add PAC UI to Wi-Fi Settings

10 years agoam c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
Jason Monk [Wed, 6 Nov 2013 02:56:49 +0000 (18:56 -0800)]
am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev

* commit 'c85359ef11221c09e7a5d55692ffda0f98b8e00c':
  Add PAC UI to Wi-Fi Settings

10 years agoam 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
Jason Monk [Wed, 6 Nov 2013 02:22:58 +0000 (18:22 -0800)]
am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev

* commit '4e42c80872e3543247913afd270fe5b9950b2969':
  Add PAC UI to Wi-Fi Settings

10 years agoMerge "Add PAC UI to Wi-Fi Settings" into klp-dev
Jason Monk [Wed, 6 Nov 2013 02:20:49 +0000 (02:20 +0000)]
Merge "Add PAC UI to Wi-Fi Settings" into klp-dev

10 years agoam 9dddb8f5: (-s ours) am e202393f: (-s ours) am 1bfd3541: (-s ours) Merge "Import...
Baligh Uddin [Tue, 5 Nov 2013 23:53:30 +0000 (15:53 -0800)]
am 9dddb8f5: (-s ours) am e202393f: (-s ours) am 1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '9dddb8f58951adf9a1b6102b93e15349f69ed4c8':
  Import translations. DO NOT MERGE

10 years agoam e34608d4: am f7f6e4bf: am 060d5fd1: Merge "Adjust power control widget minWidth...
Amith Yamasani [Tue, 5 Nov 2013 23:53:29 +0000 (15:53 -0800)]
am e34608d4: am f7f6e4bf: am 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev

* commit 'e34608d4603dfe18b189fae8806f8d22aa9ae84b':
  Adjust power control widget minWidth to occupy 4 cells.

10 years agoam e202393f: (-s ours) am 1bfd3541: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 5 Nov 2013 23:49:37 +0000 (15:49 -0800)]
am e202393f: (-s ours) am 1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'e202393f797540ebd2c472dd63b63557e9fcbab9':
  Import translations. DO NOT MERGE

10 years agoam f7f6e4bf: am 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4...
Amith Yamasani [Tue, 5 Nov 2013 23:49:25 +0000 (15:49 -0800)]
am f7f6e4bf: am 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev

* commit 'f7f6e4bfc6e9dbfb8b2b22875e62a5bfa8e1a82a':
  Adjust power control widget minWidth to occupy 4 cells.

10 years agoam 1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 23:15:23 +0000 (15:15 -0800)]
am 1bfd3541: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1bfd35410db22b1f4aabe4ad3f471bedb088584d':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 5 Nov 2013 23:12:16 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 23:12:13 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into...
Amith Yamasani [Tue, 5 Nov 2013 21:54:00 +0000 (13:54 -0800)]
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.

10 years agoMerge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev
Amith Yamasani [Tue, 5 Nov 2013 21:51:43 +0000 (21:51 +0000)]
Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev

10 years agoam c26cdd10: am 98f5e186: am c3a6cd6e: Merge "Move a line into try block"
Elliott Hughes [Tue, 5 Nov 2013 21:00:58 +0000 (13:00 -0800)]
am c26cdd10: am 98f5e186: am c3a6cd6e: Merge "Move a line into try block"

* commit 'c26cdd10cfc1e6d209f57247f8ba3fc24ca2f546':
  Move a line into try block

10 years agoam 8f40097e: am 18964c90: am 8cc60da4: Merge "Accessibility: filter touches to Enable...
Kenny Root [Tue, 5 Nov 2013 20:02:08 +0000 (12:02 -0800)]
am 8f40097e: am 18964c90: am 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev

* commit '8f40097e169232f9813ad3cf8e8e0a280106de16':
  Accessibility: filter touches to Enable button

10 years agoAdd PAC UI to Wi-Fi Settings
Jason Monk [Tue, 5 Nov 2013 16:54:48 +0000 (11:54 -0500)]
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

10 years agoam 98f5e186: am c3a6cd6e: Merge "Move a line into try block"
Elliott Hughes [Tue, 5 Nov 2013 18:35:25 +0000 (10:35 -0800)]
am 98f5e186: am c3a6cd6e: Merge "Move a line into try block"

* commit '98f5e1861da4d708e7199b5d563895cf4d2c8db7':
  Move a line into try block

10 years agoam c3a6cd6e: Merge "Move a line into try block"
Elliott Hughes [Tue, 5 Nov 2013 18:30:01 +0000 (10:30 -0800)]
am c3a6cd6e: Merge "Move a line into try block"

* commit 'c3a6cd6ee531c81f776551caa40b63732115e971':
  Move a line into try block

10 years agoMerge "Move a line into try block"
Elliott Hughes [Tue, 5 Nov 2013 16:48:46 +0000 (16:48 +0000)]
Merge "Move a line into try block"

10 years agoam 18964c90: am 8cc60da4: Merge "Accessibility: filter touches to Enable button"...
Kenny Root [Tue, 5 Nov 2013 05:55:21 +0000 (21:55 -0800)]
am 18964c90: am 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev

* commit '18964c90638dd6d2cdaaaed3001aec40482f45b1':
  Accessibility: filter touches to Enable button

10 years agoam 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev
Kenny Root [Tue, 5 Nov 2013 00:16:08 +0000 (16:16 -0800)]
am 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev

* commit '8cc60da4c91c38f7f37561ff3bbb128dcb7456d8':
  Accessibility: filter touches to Enable button

10 years agoMerge "Accessibility: filter touches to Enable button" into klp-dev
Kenny Root [Tue, 5 Nov 2013 00:12:19 +0000 (00:12 +0000)]
Merge "Accessibility: filter touches to Enable button" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Nov 2013 23:28:13 +0000 (15:28 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia3de82743ea76905ee20c14a963bb28b74a268c8
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Nov 2013 23:23:56 +0000 (15:23 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ibae16129afb209250dddbfa8415fc2c780703a94
Auto-generated-cl: translation import

10 years agoAdjust power control widget minWidth to occupy 4 cells.
Amith Yamasani [Sat, 2 Nov 2013 00:17:08 +0000 (17:17 -0700)]
Adjust power control widget minWidth to occupy 4 cells.

Bug: 10561000
Change-Id: I9a4312d956581059ea43077c5228e43e2bd1c7a5

10 years agoam c160135e: (-s ours) am 8fe316ca: (-s ours) am e2b0278f: (-s ours) Merge "Import...
Baligh Uddin [Fri, 1 Nov 2013 14:52:07 +0000 (07:52 -0700)]
am c160135e: (-s ours) am 8fe316ca: (-s ours) am e2b0278f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'c160135e0363118877afe6a538c583a7b7a4a103':
  Import translations. DO NOT MERGE

10 years agoam 8fe316ca: (-s ours) am e2b0278f: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 1 Nov 2013 14:49:47 +0000 (07:49 -0700)]
am 8fe316ca: (-s ours) am e2b0278f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8fe316cad47e2e0c73f1d7d2ec89be1eebacef09':
  Import translations. DO NOT MERGE

10 years agoam e2b0278f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 1 Nov 2013 14:47:57 +0000 (07:47 -0700)]
am e2b0278f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'e2b0278fa3ce9f04fdaa3ce690b8e1581a0dbe13':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 1 Nov 2013 14:46:30 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 1 Nov 2013 14:46:21 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMove a line into try block
Shuhrat Dehkanov [Fri, 1 Nov 2013 08:39:44 +0000 (17:39 +0900)]
Move a line into try block

Currently, NumberFormatException is never handled as
Integer.parseInt() is called outside try block.
This moves that line inside try block.

Change-Id: I54544f5a665ca0f821de5351001755cb965078dc
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
10 years agoam 67b3039d: am 2cab1344: am aa4fa0ea: Fix a bug on updating enabled IMEs
Satoshi Kataoka [Thu, 31 Oct 2013 22:13:47 +0000 (15:13 -0700)]
am 67b3039d: am 2cab1344: am aa4fa0ea: Fix a bug on updating enabled IMEs

* commit '67b3039d37c0ca4b4314129bb151183fde614aed':
  Fix a bug on updating enabled IMEs

10 years agoam 2cab1344: am aa4fa0ea: Fix a bug on updating enabled IMEs
Satoshi Kataoka [Thu, 31 Oct 2013 22:10:17 +0000 (15:10 -0700)]
am 2cab1344: am aa4fa0ea: Fix a bug on updating enabled IMEs

* commit '2cab1344037ada26710047138b59c2f8f0f4dfee':
  Fix a bug on updating enabled IMEs

10 years agoam aa4fa0ea: Fix a bug on updating enabled IMEs
Satoshi Kataoka [Thu, 31 Oct 2013 22:07:11 +0000 (15:07 -0700)]
am aa4fa0ea: Fix a bug on updating enabled IMEs

* commit 'aa4fa0ea0950ecd61af64a6bdeea109cfed64362':
  Fix a bug on updating enabled IMEs

10 years agoFix a bug on updating enabled IMEs
Satoshi Kataoka [Wed, 30 Oct 2013 20:35:45 +0000 (13:35 -0700)]
Fix a bug on updating enabled IMEs

Bug: 11354619
Change-Id: Ie33630b3dc150536bc0325ad6116ea5fdcf60740

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 30 Oct 2013 18:26:56 +0000 (11:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: I273241a8e35b1d297916d59a7f0900a9ab20863a
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 30 Oct 2013 18:23:02 +0000 (11:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie376be991f9d022ac5b4f066c7946d44d4175c2e
Auto-generated-cl: translation import

10 years agoam ed4c3aac: am 455bf4d3: am 1630ef4f: remove lockscreen widget checkbox when there...
Chris Wren [Tue, 29 Oct 2013 19:05:13 +0000 (12:05 -0700)]
am ed4c3aac: am 455bf4d3: am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.

* commit 'ed4c3aacfb020886d420299523059b37abd3f415':
  remove lockscreen widget checkbox when there's no lockscreen.

10 years agoam 455bf4d3: am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
Chris Wren [Tue, 29 Oct 2013 19:01:47 +0000 (12:01 -0700)]
am 455bf4d3: am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.

* commit '455bf4d3395e828dfbeca1f2ef5696e960874ad1':
  remove lockscreen widget checkbox when there's no lockscreen.

10 years agoam 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.
Chris Wren [Tue, 29 Oct 2013 18:59:53 +0000 (11:59 -0700)]
am 1630ef4f: remove lockscreen widget checkbox when there\'s no lockscreen.

* commit '1630ef4fc5f4131d7d7ef823ba5afba3b5b3fa72':
  remove lockscreen widget checkbox when there's no lockscreen.

10 years agoremove lockscreen widget checkbox when there's no lockscreen.
Chris Wren [Tue, 29 Oct 2013 16:30:35 +0000 (12:30 -0400)]
remove lockscreen widget checkbox when there's no lockscreen.

Bug: 11190345
Change-Id: I1b48e7a6a70226b103d8a6a27bd3374ff8349b3f

10 years agoam 91d3ccff: (-s ours) am 31735215: (-s ours) am b9687f3b: (-s ours) Import translati...
Baligh Uddin [Tue, 29 Oct 2013 03:51:41 +0000 (20:51 -0700)]
am 91d3ccff: (-s ours) am 31735215: (-s ours) am b9687f3b: (-s ours) Import translations. DO NOT MERGE

* commit '91d3ccffeb48963b06864730fbca03755588d0fc':
  Import translations. DO NOT MERGE

10 years agoam 31735215: (-s ours) am b9687f3b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Oct 2013 03:48:12 +0000 (20:48 -0700)]
am 31735215: (-s ours) am b9687f3b: (-s ours) Import translations. DO NOT MERGE

* commit '317352151ba7e84be66a01f5c8c2585ea1aacb6f':
  Import translations. DO NOT MERGE

10 years agoam b9687f3b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Oct 2013 03:44:53 +0000 (20:44 -0700)]
am b9687f3b: (-s ours) Import translations. DO NOT MERGE

* commit 'b9687f3b4ef392dbeddeeeb9de9e0b5e51f44a2f':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Oct 2013 22:23:39 +0000 (15:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic475e167a5d113bae5f55cadb821237be30e919c
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Oct 2013 22:19:24 +0000 (15:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9f5f19d06f849f0142b1667c74d3d2456ad6fe27
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Sat, 26 Oct 2013 03:30:23 +0000 (03:30 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoam 8cd39351: am bd5cbb04: am fd845410: Merge "remove primary condition check on stora...
Jeff Sharkey [Fri, 25 Oct 2013 23:14:01 +0000 (16:14 -0700)]
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.

10 years agoam bd5cbb04: am fd845410: Merge "remove primary condition check on storage format...
Jeff Sharkey [Fri, 25 Oct 2013 22:06:12 +0000 (15:06 -0700)]
am bd5cbb04: am fd845410: Merge "remove primary condition check on storage format." into klp-dev

* commit 'bd5cbb0400366faade3586e19f1deae2350c0ddd':
  remove primary condition check on storage format.

10 years agoam fd845410: Merge "remove primary condition check on storage format." into klp-dev
Jeff Sharkey [Fri, 25 Oct 2013 22:02:50 +0000 (15:02 -0700)]
am fd845410: Merge "remove primary condition check on storage format." into klp-dev

* commit 'fd845410aa3b5b572e2d72bd7d97fb5b112fa3fd':
  remove primary condition check on storage format.

10 years agoMerge "remove primary condition check on storage format." into klp-dev
Jeff Sharkey [Fri, 25 Oct 2013 22:00:07 +0000 (22:00 +0000)]
Merge "remove primary condition check on storage format." into klp-dev

10 years agoremove primary condition check on storage format.
Pierre [Wed, 23 Oct 2013 18:33:35 +0000 (11:33 -0700)]
remove primary condition check on storage format.

this change seemed to have been introduced originally
via commit d2a6f28fa7ba8189d2a1987129db27fd840fac0f
as a workaround to fix interoperability problem with MTP,
then commit 8218d3ba180505a52998caa1fd9f6a1647984e7f
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>
10 years agoMerge "Check for presence of carrier app in Mobile Plan."
Andrew Flynn [Fri, 25 Oct 2013 19:55:22 +0000 (19:55 +0000)]
Merge "Check for presence of carrier app in Mobile Plan."

10 years agoam c42d3174: (-s ours) am 0728400a: (-s ours) am 9271875c: (-s ours) Merge "Import...
Baligh Uddin [Fri, 25 Oct 2013 19:26:39 +0000 (12:26 -0700)]
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

10 years agoam 0728400a: (-s ours) am 9271875c: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 25 Oct 2013 19:25:00 +0000 (12:25 -0700)]
am 0728400a: (-s ours) am 9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '0728400a7943303b26d0f60e52050dc1fb496c68':
  Import translations. DO NOT MERGE

10 years agoam 9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 25 Oct 2013 19:22:49 +0000 (12:22 -0700)]
am 9271875c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '9271875c129d000a98a7a1fcd11f09041f26455c':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 25 Oct 2013 19:21:06 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Oct 2013 18:44:06 +0000 (11:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I485d5d31cfd721f5bec653c6d131fb89cfa628b6
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Oct 2013 18:40:25 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: If2ea17bb82d79c6a722bfa2360db9dbee83d008d
Auto-generated-cl: translation import

10 years agoam f8ac9d60: am c9c92647: am cb9d32e5: Merge "need persist adding bluetooth MAP profi...
Zhihai Xu [Fri, 25 Oct 2013 18:19:37 +0000 (11:19 -0700)]
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

10 years agoam c9c92647: am cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile...
Zhihai Xu [Fri, 25 Oct 2013 18:17:15 +0000 (11:17 -0700)]
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

10 years agoam cb9d32e5: Merge "need persist adding bluetooth MAP profile to profile list in...
Zhihai Xu [Fri, 25 Oct 2013 18:15:55 +0000 (11:15 -0700)]
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

10 years agoMerge "need persist adding bluetooth MAP profile to profile list in case the settings...
Zhihai Xu [Fri, 25 Oct 2013 18:12:48 +0000 (18:12 +0000)]
Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev

10 years agoam b557b89c: am 01b7ae29: am 83671ff8: Merge "Display remaining attempts when using...
Wink Saville [Fri, 25 Oct 2013 16:54:35 +0000 (09:54 -0700)]
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

10 years agoam 01b7ae29: am 83671ff8: Merge "Display remaining attempts when using or changing...
Wink Saville [Fri, 25 Oct 2013 16:49:34 +0000 (09:49 -0700)]
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

10 years agoam 83671ff8: Merge "Display remaining attempts when using or changing SIM PIN" into...
Wink Saville [Fri, 25 Oct 2013 16:46:29 +0000 (09:46 -0700)]
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

10 years agoMerge "Display remaining attempts when using or changing SIM PIN" into klp-dev
Wink Saville [Fri, 25 Oct 2013 16:41:08 +0000 (16:41 +0000)]
Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev

10 years agoam acc23ef6: (-s ours) am 315e78bd: (-s ours) am 2ba49855: (-s ours) Merge "Import...
Baligh Uddin [Thu, 24 Oct 2013 03:39:58 +0000 (20:39 -0700)]
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

10 years agoam 315e78bd: (-s ours) am 2ba49855: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 24 Oct 2013 03:38:22 +0000 (20:38 -0700)]
am 315e78bd: (-s ours) am 2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '315e78bd4d033e777426a46952a752d724278f18':
  Import translations. DO NOT MERGE

10 years agoam 2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 24 Oct 2013 03:35:30 +0000 (20:35 -0700)]
am 2ba49855: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2ba4985526779a52826b933597b7817952e1d0a0':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 24 Oct 2013 03:33:38 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 24 Oct 2013 03:33:34 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Oct 2013 02:54:57 +0000 (19:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: I654010b903a3b8bb4cec6a288250380bd93070e0
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Oct 2013 02:50:57 +0000 (19:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iea5d9695008ddc258cfead84f2494fb3111eefea
Auto-generated-cl: translation import

10 years agoDisplay remaining attempts when using or changing SIM PIN
Wink Saville [Thu, 24 Oct 2013 00:07:10 +0000 (17:07 -0700)]
Display remaining attempts when using or changing SIM PIN

Bug: 9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08

10 years agoam 4a66909a: am 7a40def1: am 47963424: Merge "Remove Manage Mobile Plan when config_s...
Vineeta Srivastava [Wed, 23 Oct 2013 23:17:13 +0000 (16:17 -0700)]
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

10 years agoam d947e49b: am ada38ffa: am 311a7845: Merge "Inherit translucent bars in keyguard...
John Spurlock [Wed, 23 Oct 2013 23:17:12 +0000 (16:17 -0700)]
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.

10 years agoam 7a40def1: am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_pl...
Vineeta Srivastava [Wed, 23 Oct 2013 23:14:35 +0000 (16:14 -0700)]
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

10 years agoam ada38ffa: am 311a7845: Merge "Inherit translucent bars in keyguard widget picker...
John Spurlock [Wed, 23 Oct 2013 23:14:35 +0000 (16:14 -0700)]
am ada38ffa: am 311a7845: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev

* commit 'ada38ffa3b8dca416a169d57061d2b1bdfc0cfdc':
  Inherit translucent bars in keyguard widget picker.

10 years agoam 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set...
Vineeta Srivastava [Wed, 23 Oct 2013 23:11:45 +0000 (16:11 -0700)]
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

10 years agoam 311a7845: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev
John Spurlock [Wed, 23 Oct 2013 23:11:44 +0000 (16:11 -0700)]
am 311a7845: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev

* commit '311a78455a75955b53412abcd0c41872e20f686e':
  Inherit translucent bars in keyguard widget picker.

10 years agoMerge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into...
Vineeta Srivastava [Wed, 23 Oct 2013 23:09:48 +0000 (23:09 +0000)]
Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev

10 years agoRemove Manage Mobile Plan when config_show_mobile_plan is set to false
Sungmin Choi [Tue, 15 Oct 2013 23:11:55 +0000 (16:11 -0700)]
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

10 years agoMerge "Inherit translucent bars in keyguard widget picker." into klp-dev
John Spurlock [Wed, 23 Oct 2013 15:47:52 +0000 (15:47 +0000)]
Merge "Inherit translucent bars in keyguard widget picker." into klp-dev

10 years agoInherit translucent bars in keyguard widget picker.
John Spurlock [Tue, 22 Oct 2013 20:12:12 +0000 (16:12 -0400)]
Inherit translucent bars in keyguard widget picker.

Bug:11337231
Change-Id: Ie65d5474328cec859637ba7771da5e93509236ae

10 years agoam b57eee78: (-s ours) am 5dd4a096: (-s ours) am 7fe57374: (-s ours) Merge "Import...
Baligh Uddin [Tue, 22 Oct 2013 20:05:41 +0000 (13:05 -0700)]
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

10 years agoam 5dd4a096: (-s ours) am 7fe57374: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 22 Oct 2013 20:03:32 +0000 (13:03 -0700)]
am 5dd4a096: (-s ours) am 7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5dd4a09679b373927f459a9daccd4ba87badb366':
  Import translations. DO NOT MERGE

10 years agoam 7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 22 Oct 2013 20:00:31 +0000 (13:00 -0700)]
am 7fe57374: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '7fe57374cdb67b19b98d0170e10add876f0823b1':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 22 Oct 2013 19:54:15 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 22 Oct 2013 19:54:11 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 7077e646: am 75099b67: am cace3d8d: Modified the strings according to the specs
Lifu Tang [Mon, 21 Oct 2013 23:06:09 +0000 (16:06 -0700)]
am 7077e646: am 75099b67: am cace3d8d: Modified the strings according to the specs

* commit '7077e6460e393e567d3b80da6190ff1ebe7d834a':
  Modified the strings according to the specs

10 years agoam 75099b67: am cace3d8d: Modified the strings according to the specs
Lifu Tang [Mon, 21 Oct 2013 23:03:20 +0000 (16:03 -0700)]
am 75099b67: am cace3d8d: Modified the strings according to the specs

* commit '75099b672338213e9f74462cd9ff96dd51bdd9d5':
  Modified the strings according to the specs

10 years agoam cace3d8d: Modified the strings according to the specs
Lifu Tang [Mon, 21 Oct 2013 23:00:32 +0000 (16:00 -0700)]
am cace3d8d: Modified the strings according to the specs

* commit 'cace3d8d28f005e6226a3eb909f8ebc3668ef805':
  Modified the strings according to the specs

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 21 Oct 2013 18:08:18 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie22a6c9bff23e69d4ed2fbf21c92cea4283797fe
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 21 Oct 2013 18:04:20 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic7fb5ee337d953a38cd86957054f550aa4ccc88c
Auto-generated-cl: translation import

10 years agoneed persist adding bluetooth MAP profile to profile list in case the settings proces...
Zhihai Xu [Sun, 20 Oct 2013 06:37:35 +0000 (23:37 -0700)]
need persist adding bluetooth MAP profile to profile list in case the settings process being killed

bug:11303213
Change-Id: I1f227839931872ba6fdca0b5932a24e0b002ec44

10 years agoModified the strings according to the specs
Lifu Tang [Sat, 19 Oct 2013 00:42:08 +0000 (17:42 -0700)]
Modified the strings according to the specs

- Fix b/11290711

Change-Id: I23827ad5bef4cf4bda14bb08f0e502cc4e9d2727

10 years agoam ce62f3ef: am 592ed214: am 55f03857: Merge "BT keeps on asking me if I want to...
Zhihai Xu [Fri, 18 Oct 2013 18:57:56 +0000 (11:57 -0700)]
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

10 years agoam 592ed214: am 55f03857: Merge "BT keeps on asking me if I want to allow car to...
Zhihai Xu [Fri, 18 Oct 2013 18:55:21 +0000 (11:55 -0700)]
am 592ed214: am 55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

* commit '592ed21459e543dc70c3845e808834d3226492cb':
  BT keeps on asking me if I want to allow car to do stuff

10 years agoam 55f03857: Merge "BT keeps on asking me if I want to allow car to do stuff" into...
Zhihai Xu [Fri, 18 Oct 2013 18:54:03 +0000 (11:54 -0700)]
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