OSDN Git Service

android-x86/packages-apps-Settings.git
10 years agomerge in master-release history after reset to master
The Android Automerger [Mon, 9 Sep 2013 14:50:48 +0000 (07:50 -0700)]
merge in master-release history after reset to master

10 years agoam e13049b0: am 5999658e: Merge "Dim icons when recent apps category is disabled...
Lifu Tang [Sun, 8 Sep 2013 05:15:58 +0000 (22:15 -0700)]
am e13049b0: am 5999658e: Merge "Dim icons when recent apps category is disabled" into klp-dev

* commit 'e13049b04a62212f8d47a822350a165ff9a76a2a':
  Dim icons when recent apps category is disabled

10 years agoam 5999658e: Merge "Dim icons when recent apps category is disabled" into klp-dev
Lifu Tang [Sun, 8 Sep 2013 05:14:11 +0000 (22:14 -0700)]
am 5999658e: Merge "Dim icons when recent apps category is disabled" into klp-dev

* commit '5999658ef8e5ae0e1e148cca8ab8ab90813902ba':
  Dim icons when recent apps category is disabled

10 years agoMerge "Dim icons when recent apps category is disabled" into klp-dev
Lifu Tang [Sun, 8 Sep 2013 05:12:00 +0000 (05:12 +0000)]
Merge "Dim icons when recent apps category is disabled" into klp-dev

10 years agoam 3a67c5e3: am 1e1d5324: Merge "Print service settings polish" into klp-dev
Svetoslav Ganov [Sat, 7 Sep 2013 22:12:51 +0000 (15:12 -0700)]
am 3a67c5e3: am 1e1d5324: Merge "Print service settings polish" into klp-dev

* commit '3a67c5e3b3534176d9b57480b2a9d79b1f8e6ba9':
  Print service settings polish

10 years agoam 1e1d5324: Merge "Print service settings polish" into klp-dev
Svetoslav Ganov [Sat, 7 Sep 2013 22:10:35 +0000 (15:10 -0700)]
am 1e1d5324: Merge "Print service settings polish" into klp-dev

* commit '1e1d532491ecf10e7fd5791559b5d97be5553ae4':
  Print service settings polish

10 years agoMerge "Print service settings polish" into klp-dev
Svetoslav Ganov [Sat, 7 Sep 2013 22:05:38 +0000 (22:05 +0000)]
Merge "Print service settings polish" into klp-dev

10 years agoDim icons when recent apps category is disabled
Lifu Tang [Sat, 7 Sep 2013 03:19:33 +0000 (20:19 -0700)]
Dim icons when recent apps category is disabled

- Fix b/10654646

Change-Id: I7581054b0838c801cf9a6c889e8aeb9db8c7ba56

10 years agoam 1cae5d35: am 066d04de: Merge "Gray recent apps section when location disabled...
Lifu Tang [Sat, 7 Sep 2013 01:38:12 +0000 (18:38 -0700)]
am 1cae5d35: am 066d04de: Merge "Gray recent apps section when location disabled" into klp-dev

* commit '1cae5d35b257d2ba7c018ceb87c22496bc189147':
  Gray recent apps section when location disabled

10 years agoam 066d04de: Merge "Gray recent apps section when location disabled" into klp-dev
Lifu Tang [Sat, 7 Sep 2013 01:35:35 +0000 (18:35 -0700)]
am 066d04de: Merge "Gray recent apps section when location disabled" into klp-dev

* commit '066d04def1325b97e90f1aaff77e532bf299d938':
  Gray recent apps section when location disabled

10 years agoMerge "Gray recent apps section when location disabled" into klp-dev
Lifu Tang [Sat, 7 Sep 2013 01:32:48 +0000 (01:32 +0000)]
Merge "Gray recent apps section when location disabled" into klp-dev

10 years agoGray recent apps section when location disabled
Lifu Tang [Sat, 7 Sep 2013 01:26:21 +0000 (18:26 -0700)]
Gray recent apps section when location disabled

- Fix b/10638903

Change-Id: I1c09661b0e5ac8d089a515b64301ddfe9bcedaa9

10 years agoam 0c6eb1e7: am fbf2d276: Merge "Made "No Recent Apps" banner brighter" into klp-dev
Lifu Tang [Sat, 7 Sep 2013 00:22:35 +0000 (17:22 -0700)]
am 0c6eb1e7: am fbf2d276: Merge "Made "No Recent Apps" banner brighter" into klp-dev

* commit '0c6eb1e773ca0d095d4b284950e07807a3c1f613':
  Made "No Recent Apps" banner brighter

10 years agoam fbf2d276: Merge "Made "No Recent Apps" banner brighter" into klp-dev
Lifu Tang [Sat, 7 Sep 2013 00:19:13 +0000 (17:19 -0700)]
am fbf2d276: Merge "Made "No Recent Apps" banner brighter" into klp-dev

* commit 'fbf2d276353e76958484b0489df84f5b6ef8feef':
  Made "No Recent Apps" banner brighter

10 years agoMerge "Made "No Recent Apps" banner brighter" into klp-dev
Lifu Tang [Sat, 7 Sep 2013 00:15:26 +0000 (00:15 +0000)]
Merge "Made "No Recent Apps" banner brighter" into klp-dev

10 years agoam 0c6790a7: am 8ad8bfd9: Merge "Use the application name instead of package." into...
Robert Greenwalt [Fri, 6 Sep 2013 23:39:53 +0000 (16:39 -0700)]
am 0c6790a7: am 8ad8bfd9: Merge "Use the application name instead of package." into klp-dev

* commit '0c6790a7453ed8b5edc672a209b0eb32532cb1bc':
  Use the application name instead of package.

10 years agoam 8ad8bfd9: Merge "Use the application name instead of package." into klp-dev
Robert Greenwalt [Fri, 6 Sep 2013 23:37:52 +0000 (16:37 -0700)]
am 8ad8bfd9: Merge "Use the application name instead of package." into klp-dev

* commit '8ad8bfd9aa871473a3cd1546bed34a366bfaa74f':
  Use the application name instead of package.

10 years agoMerge "Use the application name instead of package." into klp-dev
Robert Greenwalt [Fri, 6 Sep 2013 23:35:45 +0000 (23:35 +0000)]
Merge "Use the application name instead of package." into klp-dev

10 years agoMade "No Recent Apps" banner brighter
Lifu Tang [Fri, 6 Sep 2013 23:05:23 +0000 (16:05 -0700)]
Made "No Recent Apps" banner brighter

- Fix b/10638903

Change-Id: I83d3dc30315c05844ed57ee3065b099ce1ec1f96

10 years agoPrint service settings polish
Svetoslav Ganov [Fri, 6 Sep 2013 16:28:32 +0000 (09:28 -0700)]
Print service settings polish

1. Moved the settings and add printers to the overflow menu.

2. Collapsing the search action view to get proper behavior when selected.

3. Showing the search option only if there are printers.

4. Stop observing for printers if the service is disabled.

bug:10652301

Change-Id: I589a3b177c5a58a8b1382d7020fd4b128afd9038

10 years agoam f37120b9: am 4c7de613: Merge "Fix bug #10624988 Incorrect mirroring of RAM and...
Fabrice Di Meglio [Fri, 6 Sep 2013 20:46:42 +0000 (13:46 -0700)]
am f37120b9: am 4c7de613: Merge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev

* commit 'f37120b9983fc73fd7ddfc9e93517ed6ac9023a2':
  Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings

10 years agoam 0daad84e: am 421dccd5: Restrict Settings injection to system-signed apps
Tom O'Neill [Fri, 6 Sep 2013 20:46:42 +0000 (13:46 -0700)]
am 0daad84e: am 421dccd5: Restrict Settings injection to system-signed apps

* commit '0daad84e5105970d33baf3cdcf4543c6421ccc72':
  Restrict Settings injection to system-signed apps

10 years agoam 4c7de613: Merge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage...
Fabrice Di Meglio [Fri, 6 Sep 2013 20:38:45 +0000 (13:38 -0700)]
am 4c7de613: Merge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev

* commit '4c7de61320f3ea1df8d5cdd3d0645830b67722ea':
  Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings

10 years agoam 421dccd5: Restrict Settings injection to system-signed apps
Tom O'Neill [Fri, 6 Sep 2013 20:38:41 +0000 (13:38 -0700)]
am 421dccd5: Restrict Settings injection to system-signed apps

* commit '421dccd5dd8cdec03bbc704b142f3ca2396f7e40':
  Restrict Settings injection to system-signed apps

10 years agoMerge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps...
Fabrice Di Meglio [Fri, 6 Sep 2013 20:05:17 +0000 (20:05 +0000)]
Merge "Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings" into klp-dev

10 years agomerge in master-release history after reset to master
The Android Automerger [Fri, 6 Sep 2013 18:31:38 +0000 (11:31 -0700)]
merge in master-release history after reset to master

10 years agoFix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens...
Fabrice Di Meglio [Fri, 6 Sep 2013 00:02:28 +0000 (17:02 -0700)]
Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings

- well this CL is only for preventing a wrong rendering (the real CL would need to be one latter
and would need to fix the onDraw(Canvas) for LinearColorBar so that it takes care of the layout direction)
- force LTR layout direction on the LinearColorBar, hence preventing the two TextView to render their
text "in the middle".
- use BidiFormatter to wrap number strings

Change-Id: Ie164e5509c0364a81c85a3ac69f97a89f20a4130

10 years agoRestrict Settings injection to system-signed apps
Tom O'Neill [Fri, 6 Sep 2013 17:38:26 +0000 (10:38 -0700)]
Restrict Settings injection to system-signed apps

- Also: reload the injected settings status values on mode changes

- b/10461474

Change-Id: I58c817ab8ab253aa19fa02c3cb511f26c807dc2a

10 years agoam 8d697e7f: (-s ours) am f1e0c65e: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 6 Sep 2013 16:52:16 +0000 (09:52 -0700)]
am 8d697e7f: (-s ours) am f1e0c65e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam f534039f: am 0a0635c1: Merge "Don\'t show explicit time when no recent apps" into...
Lifu Tang [Fri, 6 Sep 2013 16:52:06 +0000 (09:52 -0700)]
am f534039f: am 0a0635c1: Merge "Don\'t show explicit time when no recent apps" into klp-dev

* commit 'f534039f0cdb595c4d7204ce2b4eead042cf9e4c':
  Don't show explicit time when no recent apps

10 years agoam f1e0c65e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 6 Sep 2013 03:36:00 +0000 (20:36 -0700)]
am f1e0c65e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 6 Sep 2013 03:34:28 +0000 (03:34 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 6 Sep 2013 03:34:18 +0000 (03:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 0a0635c1: Merge "Don\'t show explicit time when no recent apps" into klp-dev
Lifu Tang [Fri, 6 Sep 2013 02:03:28 +0000 (19:03 -0700)]
am 0a0635c1: Merge "Don\'t show explicit time when no recent apps" into klp-dev

* commit '0a0635c10ebf73d8133a7f96d6cae89ea9282dd2':
  Don't show explicit time when no recent apps

10 years agoMerge "Don't show explicit time when no recent apps" into klp-dev
Lifu Tang [Fri, 6 Sep 2013 02:01:17 +0000 (02:01 +0000)]
Merge "Don't show explicit time when no recent apps" into klp-dev

10 years agoam b38edd12: am 256637ff: Merge "Handle renamed APIs" into klp-dev
Amith Yamasani [Fri, 6 Sep 2013 00:33:21 +0000 (17:33 -0700)]
am b38edd12: am 256637ff: Merge "Handle renamed APIs" into klp-dev

* commit 'b38edd12c5af75325cf74c13c107607a6296b110':
  Handle renamed APIs

10 years agoam 256637ff: Merge "Handle renamed APIs" into klp-dev
Amith Yamasani [Thu, 5 Sep 2013 22:51:37 +0000 (15:51 -0700)]
am 256637ff: Merge "Handle renamed APIs" into klp-dev

* commit '256637ffb3cd5482aff5d1d38b45145d1caab0a8':
  Handle renamed APIs

10 years agoMerge "Handle renamed APIs" into klp-dev
Amith Yamasani [Thu, 5 Sep 2013 22:49:20 +0000 (22:49 +0000)]
Merge "Handle renamed APIs" into klp-dev

10 years agoam 76eed4ec: am 8aea7b4d: Merge "Fixed the NullPointerException" into klp-dev
Lifu Tang [Thu, 5 Sep 2013 21:55:54 +0000 (14:55 -0700)]
am 76eed4ec: am 8aea7b4d: Merge "Fixed the NullPointerException" into klp-dev

* commit '76eed4ecd498c7f9f21dab0df1f51fbf23ffa35c':
  Fixed the NullPointerException

10 years agoam 8aea7b4d: Merge "Fixed the NullPointerException" into klp-dev
Lifu Tang [Thu, 5 Sep 2013 21:52:12 +0000 (14:52 -0700)]
am 8aea7b4d: Merge "Fixed the NullPointerException" into klp-dev

* commit '8aea7b4d3d79163912f55a2d37657c4d33109655':
  Fixed the NullPointerException

10 years agoDon't show explicit time when no recent apps
Lifu Tang [Thu, 5 Sep 2013 21:50:29 +0000 (14:50 -0700)]
Don't show explicit time when no recent apps

- Partial fix for b/10638903

Change-Id: I38d681c52b3d03cdece48d3cdc027dcbe66bd0f2

10 years agoMerge "Fixed the NullPointerException" into klp-dev
Lifu Tang [Thu, 5 Sep 2013 21:47:00 +0000 (21:47 +0000)]
Merge "Fixed the NullPointerException" into klp-dev

10 years agoam e4443058: am 10cbbc55: Merge "Print settings polish" into klp-dev
Svetoslav Ganov [Thu, 5 Sep 2013 21:45:11 +0000 (14:45 -0700)]
am e4443058: am 10cbbc55: Merge "Print settings polish" into klp-dev

* commit 'e44430583a40dfc178924256cc4e6776f9d00701':
  Print settings polish

10 years agoam 10cbbc55: Merge "Print settings polish" into klp-dev
Svetoslav Ganov [Thu, 5 Sep 2013 21:41:35 +0000 (14:41 -0700)]
am 10cbbc55: Merge "Print settings polish" into klp-dev

* commit '10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7':
  Print settings polish

10 years agoMerge "Print settings polish" into klp-dev
Svetoslav Ganov [Thu, 5 Sep 2013 21:38:11 +0000 (21:38 +0000)]
Merge "Print settings polish" into klp-dev

10 years agoFixed the NullPointerException
Lifu Tang [Thu, 5 Sep 2013 20:52:55 +0000 (13:52 -0700)]
Fixed the NullPointerException

- Fix b/10633295

Change-Id: Ia429e679c53c959351316ffda7619e10ad6a626c

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Sep 2013 19:52:47 +0000 (12:52 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Sep 2013 19:46:15 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE

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

11 years agoHandle renamed APIs
Amith Yamasani [Thu, 5 Sep 2013 19:40:31 +0000 (12:40 -0700)]
Handle renamed APIs

Bug: 10461761
Change-Id: If63c3801663b347a4643e44d5bd3bab4e3049578

11 years agoam 3730334d: am 80c2b9b0: Hide "Play TTS sample" when locale is not settable as default
Przemyslaw Szczepaniak [Thu, 5 Sep 2013 13:29:02 +0000 (06:29 -0700)]
am 3730334d: am 80c2b9b0: Hide "Play TTS sample" when locale is not settable as default

* commit '3730334d5b9355cad691c422272c88546035deca':
  Hide "Play TTS sample" when locale is not settable as default

11 years agoam 80c2b9b0: Hide "Play TTS sample" when locale is not settable as default
Przemyslaw Szczepaniak [Thu, 5 Sep 2013 13:26:44 +0000 (06:26 -0700)]
am 80c2b9b0: Hide "Play TTS sample" when locale is not settable as default

* commit '80c2b9b0c4c03c5ae9459875c05bc7370b7d6ca0':
  Hide "Play TTS sample" when locale is not settable as default

11 years agoHide "Play TTS sample" when locale is not settable as default
Przemyslaw Szczepaniak [Thu, 5 Sep 2013 12:05:04 +0000 (13:05 +0100)]
Hide "Play TTS sample" when locale is not settable as default

Due to a bug, it's possible for settings to show status telling
that locale is available, despite locale not being in list of
locales settable as TTS default locale. This change fixes it.

Bug: 10630713
Change-Id: I21f8487fc6c1ea7812aeffbc26dfa5fc0a8afa3b

11 years agoPrint settings polish
Svetoslav Ganov [Thu, 5 Sep 2013 06:52:28 +0000 (23:52 -0700)]
Print settings polish

1. Added support for launching the top level print settings.

2. Updated some strings.

3. Removed the uninstall option for a print service.

4. Added search for the list of printers of a print service.

Change-Id: I9e175ba78b2d22b2bf90cf79153dc73327dfaff1

11 years agoam ec4f5ed1: am dd600b60: Merge "Add details screen to proc stats." into klp-dev
Dianne Hackborn [Thu, 5 Sep 2013 01:36:12 +0000 (18:36 -0700)]
am ec4f5ed1: am dd600b60: Merge "Add details screen to proc stats." into klp-dev

* commit 'ec4f5ed1a95bd26e68766252f19c407b1479bb83':
  Add details screen to proc stats.

11 years agoam dd600b60: Merge "Add details screen to proc stats." into klp-dev
Dianne Hackborn [Thu, 5 Sep 2013 01:31:29 +0000 (18:31 -0700)]
am dd600b60: Merge "Add details screen to proc stats." into klp-dev

* commit 'dd600b603d98e28219a9a38a62f2527db05736bb':
  Add details screen to proc stats.

11 years agoMerge "Add details screen to proc stats." into klp-dev
Dianne Hackborn [Thu, 5 Sep 2013 01:26:41 +0000 (01:26 +0000)]
Merge "Add details screen to proc stats." into klp-dev

11 years agoam 8ed62da6: am f7092bc6: Merge "Implementing print settings as per UX spec." into...
Svetoslav [Thu, 5 Sep 2013 00:43:48 +0000 (17:43 -0700)]
am 8ed62da6: am f7092bc6: Merge "Implementing print settings as per UX spec." into klp-dev

* commit '8ed62da68b1682245e2c8d093c96a6a3f169679a':
  Implementing print settings as per UX spec.

11 years agoAdd details screen to proc stats.
Dianne Hackborn [Wed, 4 Sep 2013 22:47:59 +0000 (15:47 -0700)]
Add details screen to proc stats.

Lets you see the actual RAM use and % running time, a list of
all of the services that are associated with it (kind-of, not
working correctly for those that share processes), and most
importantly a glorious FORCE STOP button.

Change-Id: I34ac30c88f1187227a8a7809ae103118c8b9a865

11 years agoam f7092bc6: Merge "Implementing print settings as per UX spec." into klp-dev
Svetoslav [Thu, 5 Sep 2013 00:20:45 +0000 (17:20 -0700)]
am f7092bc6: Merge "Implementing print settings as per UX spec." into klp-dev

* commit 'f7092bc6bfb16695d73f984d3c2cf557c63a17f1':
  Implementing print settings as per UX spec.

11 years agoMerge "Implementing print settings as per UX spec." into klp-dev
Svetoslav [Thu, 5 Sep 2013 00:18:48 +0000 (00:18 +0000)]
Merge "Implementing print settings as per UX spec." into klp-dev

11 years agoam 4459ca50: am 35ec3b7f: Merge "wifi-display: add drop down list for Wps config...
Chong Zhang [Wed, 4 Sep 2013 22:14:34 +0000 (15:14 -0700)]
am 4459ca50: am 35ec3b7f: Merge "wifi-display: add drop down list for Wps config method" into klp-dev

* commit '4459ca503c68edaaba357ce577c5dee0e586b252':
  wifi-display: add drop down list for Wps config method

11 years agoam 35ec3b7f: Merge "wifi-display: add drop down list for Wps config method" into...
Chong Zhang [Wed, 4 Sep 2013 22:11:34 +0000 (15:11 -0700)]
am 35ec3b7f: Merge "wifi-display: add drop down list for Wps config method" into klp-dev

* commit '35ec3b7fa389e9a2ddc131eb3a75b2f3dbc8330e':
  wifi-display: add drop down list for Wps config method

11 years agoMerge "wifi-display: add drop down list for Wps config method" into klp-dev
Chong Zhang [Wed, 4 Sep 2013 22:07:18 +0000 (22:07 +0000)]
Merge "wifi-display: add drop down list for Wps config method" into klp-dev

11 years agoImplementing print settings as per UX spec.
Svetoslav [Wed, 4 Sep 2013 04:32:40 +0000 (21:32 -0700)]
Implementing print settings as per UX spec.

Change-Id: Iafe99a1e959472f893cf168d952d9dd19ff160c0

11 years agoam f49005f9: am 97df9822: Merge "Switch to receiving LocationManager.MODE_CHANGED_ACT...
Tom O'Neill [Wed, 4 Sep 2013 14:24:44 +0000 (07:24 -0700)]
am f49005f9: am 97df9822: Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev

* commit 'f49005f9ab2d470488d24c2b534787768ebc8ebb':
  Switch to receiving LocationManager.MODE_CHANGED_ACTION

11 years agoam 97df9822: Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into...
Tom O'Neill [Wed, 4 Sep 2013 14:22:29 +0000 (07:22 -0700)]
am 97df9822: Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev

* commit '97df982296244cc067c281b97ff2a6ade2a8ca31':
  Switch to receiving LocationManager.MODE_CHANGED_ACTION

11 years agoMerge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev
Tom O'Neill [Wed, 4 Sep 2013 14:20:03 +0000 (14:20 +0000)]
Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev

11 years agoam 538f03a2: (-s ours) am c63e097a: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 4 Sep 2013 05:04:57 +0000 (22:04 -0700)]
am 538f03a2: (-s ours) am c63e097a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '538f03a2857c1b40663c597cd85368a21b628263':
  Import translations. DO NOT MERGE

11 years agoam c63e097a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 05:02:40 +0000 (22:02 -0700)]
am c63e097a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 4 Sep 2013 05:00:14 +0000 (05:00 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 05:00:08 +0000 (05:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

11 years agoam 43ce434c: am 9b444f78: Merge "Pass correct user id for the extra" into klp-dev
Amith Yamasani [Wed, 4 Sep 2013 01:02:53 +0000 (18:02 -0700)]
am 43ce434c: am 9b444f78: Merge "Pass correct user id for the extra" into klp-dev

* commit '43ce434c2c4c1f062bd3e41cc558e3bfdc22dfc8':
  Pass correct user id for the extra

11 years agoam 9b444f78: Merge "Pass correct user id for the extra" into klp-dev
Amith Yamasani [Wed, 4 Sep 2013 01:00:17 +0000 (18:00 -0700)]
am 9b444f78: Merge "Pass correct user id for the extra" into klp-dev

* commit '9b444f78f14384b59b01f966b044bb23c6af4982':
  Pass correct user id for the extra

11 years agoMerge "Pass correct user id for the extra" into klp-dev
Amith Yamasani [Wed, 4 Sep 2013 00:55:18 +0000 (00:55 +0000)]
Merge "Pass correct user id for the extra" into klp-dev

11 years agoam 67f93f16: am af6cdb2b: Merge "Pin protect going into developer mode." into klp-dev
Geoffrey Borggaard [Wed, 4 Sep 2013 00:45:25 +0000 (17:45 -0700)]
am 67f93f16: am af6cdb2b: Merge "Pin protect going into developer mode." into klp-dev

* commit '67f93f16505d8c439ace54e9849c3003e273afaf':
  Pin protect going into developer mode.

11 years agoPass correct user id for the extra
Amith Yamasani [Wed, 4 Sep 2013 00:44:49 +0000 (17:44 -0700)]
Pass correct user id for the extra

This was causing PrintManagerService to get a broadcast with an incorrect
userid and ended up crashing the SettingsProvider.

Bug: 10608503
Change-Id: I4693de181ddfa599d685ac9bd16ac15cea8b2e52

11 years agoam af6cdb2b: Merge "Pin protect going into developer mode." into klp-dev
Geoffrey Borggaard [Wed, 4 Sep 2013 00:43:51 +0000 (17:43 -0700)]
am af6cdb2b: Merge "Pin protect going into developer mode." into klp-dev

* commit 'af6cdb2b30a875b0a563196bb5c405b080b3cbe0':
  Pin protect going into developer mode.

11 years agoMerge "Pin protect going into developer mode." into klp-dev
Geoffrey Borggaard [Wed, 4 Sep 2013 00:41:50 +0000 (00:41 +0000)]
Merge "Pin protect going into developer mode." into klp-dev

11 years agoam 1a72ab95: am f4c4294c: Merge "Renamed "Location services" to "App settings"" into...
Lifu Tang [Wed, 4 Sep 2013 00:18:37 +0000 (17:18 -0700)]
am 1a72ab95: am f4c4294c: Merge "Renamed "Location services" to "App settings"" into klp-dev

* commit '1a72ab950d64ef4e13180bea78f3c215fb5f9159':
  Renamed "Location services" to "App settings"

11 years agoam f4c4294c: Merge "Renamed "Location services" to "App settings"" into klp-dev
Lifu Tang [Wed, 4 Sep 2013 00:16:14 +0000 (17:16 -0700)]
am f4c4294c: Merge "Renamed "Location services" to "App settings"" into klp-dev

* commit 'f4c4294c502d774c1c56d6b2dca56a604cc85f87':
  Renamed "Location services" to "App settings"

11 years agoMerge "Renamed "Location services" to "App settings"" into klp-dev
Lifu Tang [Wed, 4 Sep 2013 00:13:09 +0000 (00:13 +0000)]
Merge "Renamed "Location services" to "App settings"" into klp-dev

11 years agoam 4fba9109: am 58db3418: Merge "Show regulatory info based on hardware sku in Settin...
Vineeta Srivastava [Tue, 3 Sep 2013 23:57:11 +0000 (16:57 -0700)]
am 4fba9109: am 58db3418: Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev

* commit '4fba910955f54616baf462646bcc21e762d197d1':
  Show regulatory info based on hardware sku in Settings app.

11 years agoam 58db3418: Merge "Show regulatory info based on hardware sku in Settings app."...
Vineeta Srivastava [Tue, 3 Sep 2013 23:52:51 +0000 (16:52 -0700)]
am 58db3418: Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev

* commit '58db341851a0858339f83b432807e6ed87ca9fe5':
  Show regulatory info based on hardware sku in Settings app.

11 years agoMerge "Show regulatory info based on hardware sku in Settings app." into klp-dev
Vineeta Srivastava [Tue, 3 Sep 2013 23:48:34 +0000 (23:48 +0000)]
Merge "Show regulatory info based on hardware sku in Settings app." into klp-dev

11 years agoRenamed "Location services" to "App settings"
Lifu Tang [Tue, 3 Sep 2013 23:36:56 +0000 (16:36 -0700)]
Renamed "Location services" to "App settings"

- Fix b/10610559

Change-Id: I7f7167fb45ebeb045b4c0095448de0134a551eec

11 years agoam 42f82284: am b3cd38ea: Merge "Fixed the crash on screen rotation" into klp-dev
Lifu Tang [Tue, 3 Sep 2013 21:31:45 +0000 (14:31 -0700)]
am 42f82284: am b3cd38ea: Merge "Fixed the crash on screen rotation" into klp-dev

* commit '42f82284a10163033842b1c93a8e767ca0527046':
  Fixed the crash on screen rotation

11 years agoam b3cd38ea: Merge "Fixed the crash on screen rotation" into klp-dev
Lifu Tang [Tue, 3 Sep 2013 21:29:13 +0000 (14:29 -0700)]
am b3cd38ea: Merge "Fixed the crash on screen rotation" into klp-dev

* commit 'b3cd38eab4402a95e779d4d0b92480b7c53fa473':
  Fixed the crash on screen rotation

11 years agoMerge "Fixed the crash on screen rotation" into klp-dev
Lifu Tang [Tue, 3 Sep 2013 21:26:33 +0000 (21:26 +0000)]
Merge "Fixed the crash on screen rotation" into klp-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 3 Sep 2013 21:08:34 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 3 Sep 2013 21:01:35 +0000 (14:01 -0700)]
Import translations. DO NOT MERGE

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

11 years agoFixed the crash on screen rotation
Lifu Tang [Tue, 3 Sep 2013 20:47:02 +0000 (13:47 -0700)]
Fixed the crash on screen rotation

- Fix b/10607566

Change-Id: I078e59af2a76deb272b870d7708ee4148c68590e

11 years agoam 8725d762: am 69a50431: Merge changes Ie232b2d4,I81b6bf3f into klp-dev
Russell Brenner [Tue, 3 Sep 2013 20:34:40 +0000 (13:34 -0700)]
am 8725d762: am 69a50431: Merge changes Ie232b2d4,I81b6bf3f into klp-dev

* commit '8725d762038cd8af819ba45eee230e3af3623e0c':
  Add resources for light theme
  Support Holo Light theme for wifi during setup

11 years agoam dc39241b: am 81eae57f: Merge "Adapt to renaming of SettingInjectorService API...
Tom O'Neill [Tue, 3 Sep 2013 20:34:39 +0000 (13:34 -0700)]
am dc39241b: am 81eae57f: Merge "Adapt to renaming of SettingInjectorService API constants" into klp-dev

* commit 'dc39241b536bddb3e099832e2e2d483d65c60a97':
  Adapt to renaming of SettingInjectorService API constants

11 years agoam 69a50431: Merge changes Ie232b2d4,I81b6bf3f into klp-dev
Russell Brenner [Tue, 3 Sep 2013 20:32:00 +0000 (13:32 -0700)]
am 69a50431: Merge changes Ie232b2d4,I81b6bf3f into klp-dev

* commit '69a5043130ae0bb01d7b2608aac340b7abc0c590':
  Add resources for light theme
  Support Holo Light theme for wifi during setup

11 years agoam 81eae57f: Merge "Adapt to renaming of SettingInjectorService API constants" into...
Tom O'Neill [Tue, 3 Sep 2013 20:32:00 +0000 (13:32 -0700)]
am 81eae57f: Merge "Adapt to renaming of SettingInjectorService API constants" into klp-dev

* commit '81eae57f2c16e9f2934cfdf887e8f4832f703f4a':
  Adapt to renaming of SettingInjectorService API constants

11 years agoMerge changes Ie232b2d4,I81b6bf3f into klp-dev
Russell Brenner [Tue, 3 Sep 2013 20:26:42 +0000 (20:26 +0000)]
Merge changes Ie232b2d4,I81b6bf3f into klp-dev

* changes:
  Add resources for light theme
  Support Holo Light theme for wifi during setup

11 years agoMerge "Adapt to renaming of SettingInjectorService API constants" into klp-dev
Tom O'Neill [Tue, 3 Sep 2013 20:26:09 +0000 (20:26 +0000)]
Merge "Adapt to renaming of SettingInjectorService API constants" into klp-dev

11 years agoShow regulatory info based on hardware sku in Settings app.
Vineeta Srivastava [Thu, 29 Aug 2013 00:17:57 +0000 (17:17 -0700)]
Show regulatory info based on hardware sku in Settings app.

Use ro.boot.hardware.sku to read hardware sku property. When this property is
 set use regulatory_info_<sku>.img. By default use regulatory_info.png

Updated layout to set ImageView.

Bug: 9378140

Change-Id: I8e3622a89742333818297759585227c6290ccf31

11 years agoam 703689be: am 7e2227fc: Merge "Ignores AppOps entries belonging to other users...
Lifu Tang [Tue, 3 Sep 2013 18:00:39 +0000 (11:00 -0700)]
am 703689be: am 7e2227fc: Merge "Ignores AppOps entries belonging to other users" into klp-dev

* commit '703689beed8b39b30f0fd57f9735f3f800bd86b3':
  Ignores AppOps entries belonging to other users

11 years agoam 7e2227fc: Merge "Ignores AppOps entries belonging to other users" into klp-dev
Lifu Tang [Tue, 3 Sep 2013 17:57:30 +0000 (10:57 -0700)]
am 7e2227fc: Merge "Ignores AppOps entries belonging to other users" into klp-dev

* commit '7e2227fc657cf22f39a5db4741e6ab46b20c0dc2':
  Ignores AppOps entries belonging to other users