OSDN Git Service

android-x86/packages-apps-Settings.git
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

10 years agoMerge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
Zhihai Xu [Fri, 18 Oct 2013 18:51:16 +0000 (18:51 +0000)]
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

10 years agoam 544db7fa: (-s ours) am 56f47bf1: am ea90cd2f: Do not merge. Refresh "InputMethodPr...
Satoshi Kataoka [Fri, 18 Oct 2013 18:24:03 +0000 (11:24 -0700)]
am 544db7fa: (-s ours) am 56f47bf1: am ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume

* commit '544db7fad02457d96ae0d69fb458cf7c10f03b1c':
  Do not merge. Refresh "InputMethodPreference"s onResume

10 years agoam 56f47bf1: am ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume
Satoshi Kataoka [Fri, 18 Oct 2013 18:21:32 +0000 (11:21 -0700)]
am 56f47bf1: am ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume

* commit '56f47bf11bb041eff3333c9047a6ebef5d50a59e':
  Do not merge. Refresh "InputMethodPreference"s onResume

10 years agoam ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume
Satoshi Kataoka [Fri, 18 Oct 2013 18:18:29 +0000 (11:18 -0700)]
am ea90cd2f: Do not merge. Refresh "InputMethodPreference"s onResume

* commit 'ea90cd2fca08e5c65e54d8df1c208337e08fc541':
  Do not merge. Refresh "InputMethodPreference"s onResume

10 years agoDo not merge. Refresh "InputMethodPreference"s onResume
Satoshi Kataoka [Fri, 18 Oct 2013 07:57:57 +0000 (16:57 +0900)]
Do not merge. Refresh "InputMethodPreference"s onResume

Corresponding change is I015075d57ebed94d6b

Bug: 11245599
Change-Id: I8be2b9a81d41fab979afe000bd1bce6fc57550c7

10 years agoRefresh "InputMethodPreference"s onResume
Satoshi Kataoka [Fri, 18 Oct 2013 07:57:57 +0000 (16:57 +0900)]
Refresh "InputMethodPreference"s onResume

Bug: 11245599

Change-Id: I015075d57ebed94d6b76a66de135ee748e27e3a6

10 years agoBT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Fri, 18 Oct 2013 00:11:38 +0000 (17:11 -0700)]
BT keeps on asking me if I want to allow car to do stuff

Persist the "no" count
bug:11176511

Change-Id: I39674334fe8bf09d1f3f2b07c12513a6c46f053b

10 years agoam e9e80ada: (-s ours) am 3796a55e: (-s ours) am 2496a32c: (-s ours) Import translati...
Baligh Uddin [Thu, 17 Oct 2013 21:40:48 +0000 (14:40 -0700)]
am e9e80ada: (-s ours) am 3796a55e: (-s ours) am 2496a32c: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 3796a55e: (-s ours) am 2496a32c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 21:33:37 +0000 (14:33 -0700)]
am 3796a55e: (-s ours) am 2496a32c: (-s ours) Import translations. DO NOT MERGE

* commit '3796a55ed221dd4e3c5eda1fc1699c539b2dd54d':
  Import translations. DO NOT MERGE

10 years agoam 2496a32c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 21:31:54 +0000 (14:31 -0700)]
am 2496a32c: (-s ours) Import translations. DO NOT MERGE

* commit '2496a32ca67270e5570f97b780ae47aade080e0d':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 21:30:00 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 21:21:57 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam fba7df30: (-s ours) am 2fa95373: (-s ours) am 025b6ecf: (-s ours) Merge "Import...
Baligh Uddin [Thu, 17 Oct 2013 17:28:56 +0000 (10:28 -0700)]
am fba7df30: (-s ours) am 2fa95373: (-s ours) am 025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 2fa95373: (-s ours) am 025b6ecf: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 17 Oct 2013 17:27:16 +0000 (10:27 -0700)]
am 2fa95373: (-s ours) am 025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 17 Oct 2013 17:25:29 +0000 (10:25 -0700)]
am 025b6ecf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '025b6ecff220b3117b892df1d9f4bd35a4fb4527':
  Import translations. DO NOT MERGE

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

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

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

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 06:13:11 +0000 (23:13 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam e7f63626: am 820e7010: am 3f90a454: Merge "BT keeps on asking me if I want to...
Zhihai Xu [Thu, 17 Oct 2013 02:35:03 +0000 (19:35 -0700)]
am e7f63626: am 820e7010: am 3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

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

10 years agoam 820e7010: am 3f90a454: Merge "BT keeps on asking me if I want to allow car to...
Zhihai Xu [Thu, 17 Oct 2013 02:31:52 +0000 (19:31 -0700)]
am 820e7010: am 3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

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

10 years agoam 3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into...
Zhihai Xu [Thu, 17 Oct 2013 02:29:49 +0000 (19:29 -0700)]
am 3f90a454: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

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

10 years agoMerge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
Zhihai Xu [Thu, 17 Oct 2013 02:27:10 +0000 (02:27 +0000)]
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev

10 years agoam bc6aa63a: am 5af7e568: am 67390aad: merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 01:02:13 +0000 (18:02 -0700)]
am bc6aa63a: am 5af7e568: am 67390aad: merge in klp-release (no-op)

* commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e':
  updated launcher settings icon to gray gear
  Load account type icons in a background thread before scrolling down
  Updated de-blued backgrounds for settings power widget.
  Add print job settings screen.

10 years agoam 5af7e568: am 67390aad: merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:56:40 +0000 (17:56 -0700)]
am 5af7e568: am 67390aad: merge in klp-release (no-op)

* commit '5af7e568115097a6759f6bfc11620690944381c8':
  updated launcher settings icon to gray gear
  Load account type icons in a background thread before scrolling down
  Updated de-blued backgrounds for settings power widget.
  Add print job settings screen.

10 years agoam 67390aad: merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:52:06 +0000 (17:52 -0700)]
am 67390aad: merge in klp-release (no-op)

* commit '67390aad4f8a091dc14ea825ede292f8a52efb47':
  updated launcher settings icon to gray gear
  Load account type icons in a background thread before scrolling down
  Updated de-blued backgrounds for settings power widget.
  Add print job settings screen.

10 years agomerge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:46:24 +0000 (17:46 -0700)]
merge in klp-release (no-op)

10 years agoam 06c0a90d: am a31d8b71: am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE
Christopher Tate [Wed, 16 Oct 2013 20:46:45 +0000 (13:46 -0700)]
am 06c0a90d: am a31d8b71: am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE

* commit '06c0a90d7805a8fdce4156af839a6e4d14b33702':
  User ID, not uid, in an EXTRA_USER_HANDLE

10 years agoam a31d8b71: am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE
Christopher Tate [Wed, 16 Oct 2013 20:43:46 +0000 (13:43 -0700)]
am a31d8b71: am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE

* commit 'a31d8b7194793a2ef01f36bd07d70043762de02e':
  User ID, not uid, in an EXTRA_USER_HANDLE

10 years agoam 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE
Christopher Tate [Wed, 16 Oct 2013 20:41:43 +0000 (13:41 -0700)]
am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE

* commit '235e5d686fc73cfd82605bac86dcc9673916c5b7':
  User ID, not uid, in an EXTRA_USER_HANDLE

10 years agoUser ID, not uid, in an EXTRA_USER_HANDLE
Christopher Tate [Wed, 16 Oct 2013 20:24:36 +0000 (13:24 -0700)]
User ID, not uid, in an EXTRA_USER_HANDLE

Bug 11208808

Change-Id: Ica30c2114c922fc38460cafc14c02f10051717c9

10 years agoBT keeps on asking me if I want to allow car to do stuff
Zhihai Xu [Tue, 15 Oct 2013 18:27:54 +0000 (11:27 -0700)]
BT keeps on asking me if I want to allow car to do stuff

remember how many time the user choose the "no",
if user choose "no" twice, we will make it persist.
bug:11176511

Change-Id: I7234e7b4ba4586065dea462029e2da5ddaf53316

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 15 Oct 2013 13:01:17 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoResolved conflicts for merge of 67e72aa4 to master
Torne (Richard Coles) [Tue, 15 Oct 2013 12:37:35 +0000 (13:37 +0100)]
Resolved conflicts for merge of 67e72aa4 to master

Change-Id: Ib3904427c8f6bcc19895b39e4ce65eaa626e8396

10 years agoam 9880646e: am f88e5442: Merge "Remove experimental WebView setting." into klp-dev
Torne (Richard Coles) [Tue, 15 Oct 2013 10:37:07 +0000 (03:37 -0700)]
am 9880646e: am f88e5442: Merge "Remove experimental WebView setting." into klp-dev

* commit '9880646e197331b99ba9824b7d47f12391c82bf4':
  Remove experimental WebView setting.

10 years agoam f88e5442: Merge "Remove experimental WebView setting." into klp-dev
Torne (Richard Coles) [Tue, 15 Oct 2013 10:34:15 +0000 (03:34 -0700)]
am f88e5442: Merge "Remove experimental WebView setting." into klp-dev

* commit 'f88e5442f5d2492d415864d1cd118d610b0005d0':
  Remove experimental WebView setting.

10 years agoMerge "Remove experimental WebView setting." into klp-dev
Torne (Richard Coles) [Tue, 15 Oct 2013 10:31:46 +0000 (10:31 +0000)]
Merge "Remove experimental WebView setting." into klp-dev

10 years agoam 81d0f1b9: (-s ours) am 9f9a9652: (-s ours) am 740702ce: (-s ours) Import translati...
Baligh Uddin [Tue, 15 Oct 2013 03:01:30 +0000 (20:01 -0700)]
am 81d0f1b9: (-s ours) am 9f9a9652: (-s ours) am 740702ce: (-s ours) Import translations. DO NOT MERGE

* commit '81d0f1b93c9e1be59546a5efa875202378efacbe':
  Import translations. DO NOT MERGE

10 years agoam 9f9a9652: (-s ours) am 740702ce: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 15 Oct 2013 02:01:01 +0000 (19:01 -0700)]
am 9f9a9652: (-s ours) am 740702ce: (-s ours) Import translations. DO NOT MERGE

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

10 years agoMerge "Refresh peer list when entering wifi p2p settings"
Yuhao Zheng [Tue, 15 Oct 2013 00:25:28 +0000 (00:25 +0000)]
Merge "Refresh peer list when entering wifi p2p settings"

10 years agoam 740702ce: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 15 Oct 2013 00:19:28 +0000 (17:19 -0700)]
am 740702ce: (-s ours) Import translations. DO NOT MERGE

* commit '740702ced3d69f3c0b8208ace86e88e4a76ccba0':
  Import translations. DO NOT MERGE

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

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

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

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

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

10 years agoam ce4a93f3: (-s ours) am fea253e0: (-s ours) am 37473121: (-s ours) Import translati...
Baligh Uddin [Mon, 14 Oct 2013 17:50:16 +0000 (10:50 -0700)]
am ce4a93f3: (-s ours) am fea253e0: (-s ours) am 37473121: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam d7e8a7f8: (-s ours) am 84c377f5: (-s ours) am 9c861f80: (-s ours) Import translati...
Baligh Uddin [Mon, 14 Oct 2013 17:48:34 +0000 (10:48 -0700)]
am d7e8a7f8: (-s ours) am 84c377f5: (-s ours) am 9c861f80: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 7508ef29: (-s ours) am 8dd824b6: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Oct 2013 17:48:34 +0000 (10:48 -0700)]
am 7508ef29: (-s ours) am 8dd824b6: (-s ours) Import translations. DO NOT MERGE

* commit '7508ef29dc4fd823048a3dfc4053a0dea2191c5c':
  Import translations. DO NOT MERGE

10 years agoRemove experimental WebView setting.
Torne (Richard Coles) [Mon, 14 Oct 2013 16:35:43 +0000 (17:35 +0100)]
Remove experimental WebView setting.

The experimental WebView is no longer experimental; remove the setting
from the settings app.

Bug: 10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 13 Oct 2013 13:02:42 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam fea253e0: (-s ours) am 37473121: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 13:46:01 +0000 (06:46 -0700)]
am fea253e0: (-s ours) am 37473121: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 37473121: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 13:43:48 +0000 (06:43 -0700)]
am 37473121: (-s ours) Import translations. DO NOT MERGE

* commit '37473121937ad62b616e849e21954cf39583e465':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 07:59:55 +0000 (00:59 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 12 Oct 2013 07:56:01 +0000 (00:56 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 84c377f5: (-s ours) am 9c861f80: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 22:03:27 +0000 (15:03 -0700)]
am 84c377f5: (-s ours) am 9c861f80: (-s ours) Import translations. DO NOT MERGE

* commit '84c377f51a0995b2f70028df12abb9f98c44e915':
  Import translations. DO NOT MERGE

10 years agoam 8dd824b6: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 22:03:26 +0000 (15:03 -0700)]
am 8dd824b6: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 9c861f80: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 22:01:27 +0000 (15:01 -0700)]
am 9c861f80: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 21:56:37 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE

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

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

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 21:47:56 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE

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