OSDN Git Service

android-x86/packages-apps-Settings.git
11 years agoam 96dd39ba: am d3dbc6e3: Launches the Location setting as fragment
Lifu Tang [Tue, 20 Aug 2013 02:04:04 +0000 (19:04 -0700)]
am 96dd39ba: am d3dbc6e3: Launches the Location setting as fragment

* commit '96dd39badd1d82e1db360b77849ee26198a7d1c9':
  Launches the Location setting as fragment

11 years agoam d3dbc6e3: Launches the Location setting as fragment
Lifu Tang [Tue, 20 Aug 2013 02:01:08 +0000 (19:01 -0700)]
am d3dbc6e3: Launches the Location setting as fragment

* commit 'd3dbc6e3a187b9de69b83915400425032d287dec':
  Launches the Location setting as fragment

11 years agoLaunches the Location setting as fragment
Lifu Tang [Fri, 16 Aug 2013 19:44:54 +0000 (12:44 -0700)]
Launches the Location setting as fragment

Change-Id: I0fb04a346236676ce9483a0c4d1fc3b2b590b08c

11 years agoam 2e45637a: am b9ab196b: Sort recent apps, show message when no recent apps
Lifu Tang [Tue, 20 Aug 2013 01:35:52 +0000 (18:35 -0700)]
am 2e45637a: am b9ab196b: Sort recent apps, show message when no recent apps

* commit '2e45637aeb775832b71a69fb26c5b6b754688960':
  Sort recent apps, show message when no recent apps

11 years agoam b9ab196b: Sort recent apps, show message when no recent apps
Lifu Tang [Tue, 20 Aug 2013 01:33:08 +0000 (18:33 -0700)]
am b9ab196b: Sort recent apps, show message when no recent apps

* commit 'b9ab196bb520fed9b23aa9a259fab08084646c2c':
  Sort recent apps, show message when no recent apps

11 years agoSort recent apps, show message when no recent apps
Lifu Tang [Sun, 18 Aug 2013 07:34:20 +0000 (00:34 -0700)]
Sort recent apps, show message when no recent apps

Change-Id: I70bb1913435b46fc87aec10075e43f98ef07ef62

11 years agoam 0acf3cfc: am dbd2f759: Merge "Supress Location button when coming from Location...
Lifu Tang [Mon, 19 Aug 2013 21:38:56 +0000 (14:38 -0700)]
am 0acf3cfc: am dbd2f759: Merge "Supress Location button when coming from Location" into klp-dev

* commit '0acf3cfc8c55bac60295eb3f7e9ee6345186eb3c':
  Supress Location button when coming from Location

11 years agoam dbd2f759: Merge "Supress Location button when coming from Location" into klp-dev
Lifu Tang [Mon, 19 Aug 2013 21:37:09 +0000 (14:37 -0700)]
am dbd2f759: Merge "Supress Location button when coming from Location" into klp-dev

* commit 'dbd2f7592943f49dd8227f01fa9c5d14e4e58c0b':
  Supress Location button when coming from Location

11 years agoMerge "Supress Location button when coming from Location" into klp-dev
Lifu Tang [Mon, 19 Aug 2013 21:33:22 +0000 (21:33 +0000)]
Merge "Supress Location button when coming from Location" into klp-dev

11 years agoam 88d83a90: am c7679b0e: Merge "Don\'t crash when procstats has data for a now-disus...
Christopher Tate [Mon, 19 Aug 2013 21:22:47 +0000 (14:22 -0700)]
am 88d83a90: am c7679b0e: Merge "Don\'t crash when procstats has data for a now-disused uid" into klp-dev

* commit '88d83a901f42ad8041a29b899a1379b683fcea7a':
  Don't crash when procstats has data for a now-disused uid

11 years agoam c7679b0e: Merge "Don\'t crash when procstats has data for a now-disused uid" into...
Christopher Tate [Mon, 19 Aug 2013 21:20:50 +0000 (14:20 -0700)]
am c7679b0e: Merge "Don\'t crash when procstats has data for a now-disused uid" into klp-dev

* commit 'c7679b0ef23fb137266c8ad03312bddbd807a87b':
  Don't crash when procstats has data for a now-disused uid

11 years agoMerge "Don't crash when procstats has data for a now-disused uid" into klp-dev
Christopher Tate [Mon, 19 Aug 2013 21:19:11 +0000 (21:19 +0000)]
Merge "Don't crash when procstats has data for a now-disused uid" into klp-dev

11 years agoSupress Location button when coming from Location
Lifu Tang [Sun, 18 Aug 2013 08:23:45 +0000 (01:23 -0700)]
Supress Location button when coming from Location

Change-Id: Ie1f1aed17206530ec7c8a1cde43a4380b7232823

11 years agoam 9378f595: (-s ours) am 6a5c9a83: (-s ours) am 1df37ff1: (-s ours) am 2b851859...
Baligh Uddin [Mon, 19 Aug 2013 20:14:28 +0000 (13:14 -0700)]
am 9378f595: (-s ours) am 6a5c9a83: (-s ours) am 1df37ff1: (-s ours) am 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE

* commit '9378f595073a15eff7306e1d90a9efad36093212':
  Import translations. DO NOT MERGE

11 years agoam 55b57ed7: (-s ours) am 05e3f627: (-s ours) am 5c601791: (-s ours) am 8485f115...
Baligh Uddin [Mon, 19 Aug 2013 20:14:27 +0000 (13:14 -0700)]
am 55b57ed7: (-s ours) am 05e3f627: (-s ours) am 5c601791: (-s ours) am 8485f115: (-s ours) Import translations. DO NOT MERGE

* commit '55b57ed7d5a91a5599c5760d0a61741c3079e0f8':
  Import translations. DO NOT MERGE

11 years agoam 3bcfffca: (-s ours) am b0130e7b: (-s ours) am 21cbd017: (-s ours) am e37538b1...
Baligh Uddin [Mon, 19 Aug 2013 20:14:27 +0000 (13:14 -0700)]
am 3bcfffca: (-s ours) am b0130e7b: (-s ours) am 21cbd017: (-s ours) am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE

* commit '3bcfffca914ddc51084f9b3510aca5f79a71b496':
  Import translations. DO NOT MERGE

11 years agoam 6a5c9a83: (-s ours) am 1df37ff1: (-s ours) am 2b851859: (-s ours) am b09878b8...
Baligh Uddin [Mon, 19 Aug 2013 20:13:07 +0000 (13:13 -0700)]
am 6a5c9a83: (-s ours) am 1df37ff1: (-s ours) am 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE

* commit '6a5c9a83d6a5667cefff5c4a13d90f670d625c47':
  Import translations. DO NOT MERGE

11 years agoam 1df37ff1: (-s ours) am 2b851859: (-s ours) am b09878b8: (-s ours) Import translati...
Baligh Uddin [Mon, 19 Aug 2013 20:09:43 +0000 (13:09 -0700)]
am 1df37ff1: (-s ours) am 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam 05e3f627: (-s ours) am 5c601791: (-s ours) am 8485f115: (-s ours) Import translati...
Baligh Uddin [Mon, 19 Aug 2013 20:09:36 +0000 (13:09 -0700)]
am 05e3f627: (-s ours) am 5c601791: (-s ours) am 8485f115: (-s ours) Import translations. DO NOT MERGE

* commit '05e3f627477053b1568558de5454b7b5e8b5805d':
  Import translations. DO NOT MERGE

11 years agoam b0130e7b: (-s ours) am 21cbd017: (-s ours) am e37538b1: (-s ours) am 8c6de9e0...
Baligh Uddin [Mon, 19 Aug 2013 20:09:35 +0000 (13:09 -0700)]
am b0130e7b: (-s ours) am 21cbd017: (-s ours) am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam 6d3d55e6: (-s ours) am c7ec87f1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:07:24 +0000 (13:07 -0700)]
am 6d3d55e6: (-s ours) am c7ec87f1: (-s ours) Import translations. DO NOT MERGE

* commit '6d3d55e6138f18850e8116716efec06292ccc194':
  Import translations. DO NOT MERGE

11 years agoam 5c601791: (-s ours) am 8485f115: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:06:15 +0000 (13:06 -0700)]
am 5c601791: (-s ours) am 8485f115: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam 21cbd017: (-s ours) am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translati...
Baligh Uddin [Mon, 19 Aug 2013 20:06:14 +0000 (13:06 -0700)]
am 21cbd017: (-s ours) am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE

* commit '21cbd017a3201639097cda31c59f769d1cc2b739':
  Import translations. DO NOT MERGE

11 years agoam 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:04:58 +0000 (13:04 -0700)]
am 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam c7ec87f1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:02:18 +0000 (13:02 -0700)]
am c7ec87f1: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam b09878b8: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:01:53 +0000 (13:01 -0700)]
am b09878b8: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam 8485f115: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:00:37 +0000 (13:00 -0700)]
am 8485f115: (-s ours) Import translations. DO NOT MERGE

* commit '8485f115d25968c0fa3ab9d1ea42d2751422feb5':
  Import translations. DO NOT MERGE

11 years agoam e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:00:36 +0000 (13:00 -0700)]
am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 19:14:29 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 19:08:24 +0000 (12:08 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 19:04:34 +0000 (12:04 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 19:03:06 +0000 (12:03 -0700)]
Import translations. DO NOT MERGE

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

11 years agoDon't crash when procstats has data for a now-disused uid
Christopher Tate [Mon, 19 Aug 2013 00:26:48 +0000 (17:26 -0700)]
Don't crash when procstats has data for a now-disused uid

That is, PackageManager.getPackagesForUid(uid) can return null,
so deal with it.

Bug 10374656

Change-Id: I4eacd48c809b778e131d37dba0e86c583553e41f

11 years agoam 905c00a4: am 55fe056d: Merge "Don\'t apply encryption password requirements for...
Amith Yamasani [Fri, 16 Aug 2013 01:11:30 +0000 (18:11 -0700)]
am 905c00a4: am 55fe056d: Merge "Don\'t apply encryption password requirements for secondary users" into klp-dev

* commit '905c00a405ef2b26c58f19f21d153302c1e21e76':
  Don't apply encryption password requirements for secondary users

11 years agoam 55fe056d: Merge "Don\'t apply encryption password requirements for secondary users...
Amith Yamasani [Fri, 16 Aug 2013 01:09:06 +0000 (18:09 -0700)]
am 55fe056d: Merge "Don\'t apply encryption password requirements for secondary users" into klp-dev

* commit '55fe056d96bdb683dce0a4e66e7390d19f23e710':
  Don't apply encryption password requirements for secondary users

11 years agoMerge "Don't apply encryption password requirements for secondary users" into klp-dev
Amith Yamasani [Fri, 16 Aug 2013 01:04:51 +0000 (01:04 +0000)]
Merge "Don't apply encryption password requirements for secondary users" into klp-dev

11 years agoam 44a224ca: (-s ours) am 239c79c8: (-s ours) am a7238c18: (-s ours) am dbf26e70...
Baligh Uddin [Fri, 16 Aug 2013 01:01:09 +0000 (18:01 -0700)]
am 44a224ca: (-s ours) am 239c79c8: (-s ours) am a7238c18: (-s ours) am dbf26e70: (-s ours) Import translations. DO NOT MERGE

* commit '44a224cabf32a5ce117bbc2b409b49f59cfe1e0b':
  Import translations. DO NOT MERGE

11 years agoam 239c79c8: (-s ours) am a7238c18: (-s ours) am dbf26e70: (-s ours) Import translati...
Baligh Uddin [Fri, 16 Aug 2013 00:57:48 +0000 (17:57 -0700)]
am 239c79c8: (-s ours) am a7238c18: (-s ours) am dbf26e70: (-s ours) Import translations. DO NOT MERGE

* commit '239c79c8d7f4b7c29c66f199eb7a5813b546ecb2':
  Import translations. DO NOT MERGE

11 years agoam a7238c18: (-s ours) am dbf26e70: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:54:13 +0000 (17:54 -0700)]
am a7238c18: (-s ours) am dbf26e70: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam 28132bfd: (-s ours) am eff5cd87: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 16 Aug 2013 00:49:20 +0000 (17:49 -0700)]
am 28132bfd: (-s ours) am eff5cd87: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '28132bfd3e5c99828fe0092c6f7ebe5156b23524':
  Import translations. DO NOT MERGE

11 years agoam 8c6de9e0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:48:11 +0000 (17:48 -0700)]
am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam dbf26e70: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:48:05 +0000 (17:48 -0700)]
am dbf26e70: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam eff5cd87: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 16 Aug 2013 00:47:37 +0000 (17:47 -0700)]
am eff5cd87: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 16 Aug 2013 00:45:11 +0000 (00:45 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 16 Aug 2013 00:44:53 +0000 (00:44 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

11 years agoam 97fb8dbb: am 3d74aeaa: Merge "LE: Add support for the HID-over-GATT profile (3...
Zhihai Xu [Fri, 16 Aug 2013 00:28:39 +0000 (17:28 -0700)]
am 97fb8dbb: am 3d74aeaa: Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev

* commit '97fb8dbbe8473fb53e33d6bb844773f69be7d776':
  LE: Add support for the HID-over-GATT profile (3/3)

11 years agoam 3d74aeaa: Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
Zhihai Xu [Fri, 16 Aug 2013 00:24:54 +0000 (17:24 -0700)]
am 3d74aeaa: Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev

* commit '3d74aeaa85285425fc5f20cf93f615a4ead6d2fd':
  LE: Add support for the HID-over-GATT profile (3/3)

11 years agoMerge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
Zhihai Xu [Fri, 16 Aug 2013 00:22:33 +0000 (00:22 +0000)]
Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev

11 years agoam 5c12d789: am c3e9ac93: Linked the recent location apps to battery page
Lifu Tang [Fri, 16 Aug 2013 00:01:08 +0000 (17:01 -0700)]
am 5c12d789: am c3e9ac93: Linked the recent location apps to battery page

* commit '5c12d789f520b5b9542c6826c521490a16aa9ee0':
  Linked the recent location apps to battery page

11 years agoam c3e9ac93: Linked the recent location apps to battery page
Lifu Tang [Thu, 15 Aug 2013 23:59:25 +0000 (16:59 -0700)]
am c3e9ac93: Linked the recent location apps to battery page

* commit 'c3e9ac937a4ba948d47cbb83f6999af34fd00b65':
  Linked the recent location apps to battery page

11 years agoDon't apply encryption password requirements for secondary users
Amith Yamasani [Thu, 15 Aug 2013 22:35:49 +0000 (15:35 -0700)]
Don't apply encryption password requirements for secondary users

Bug: 10314289
Change-Id: I54a54f910c914b41abd3e18963b4bd0c3cddb34a

11 years agoLE: Add support for the HID-over-GATT profile (3/3)
Andre Eisenbach [Fri, 8 Mar 2013 02:05:12 +0000 (18:05 -0800)]
LE: Add support for the HID-over-GATT profile (3/3)

bug:8330048
Change-Id: I0999c3af999939aec88eba4c38bca4358c554e69

11 years agoLinked the recent location apps to battery page
Lifu Tang [Mon, 12 Aug 2013 23:34:45 +0000 (16:34 -0700)]
Linked the recent location apps to battery page

* Extracted BatteryStatsHelper from PowerUsageSummary

* Dropped the "pause" and "resume" method from the
RadioButtonPreference

* Opening battery usage page when the user clicks the recent location
apps item

Change-Id: I5a2d03271434765780154265976d8caa7f8060d8

11 years agoam adb9f2b9: am 5db411db: Merge "Shows "App Info" for system apps" into klp-dev
Lifu Tang [Thu, 15 Aug 2013 19:19:05 +0000 (12:19 -0700)]
am adb9f2b9: am 5db411db: Merge "Shows "App Info" for system apps" into klp-dev

* commit 'adb9f2b9929d4aa9086902f5976388ed61181674':
  Shows "App Info" for system apps

11 years agoam 5db411db: Merge "Shows "App Info" for system apps" into klp-dev
Lifu Tang [Thu, 15 Aug 2013 19:17:03 +0000 (12:17 -0700)]
am 5db411db: Merge "Shows "App Info" for system apps" into klp-dev

* commit '5db411db9881ea9ec48f2a607b711d8daa74d1ca':
  Shows "App Info" for system apps

11 years agoMerge "Shows "App Info" for system apps" into klp-dev
Lifu Tang [Thu, 15 Aug 2013 19:13:42 +0000 (19:13 +0000)]
Merge "Shows "App Info" for system apps" into klp-dev

11 years agoam 9e96c453: am a1fa7cef: am 1faefa06: Merge "Fix one NPE in tethering setting"
Robert Greenwalt [Thu, 15 Aug 2013 14:21:07 +0000 (07:21 -0700)]
am 9e96c453: am a1fa7cef: am 1faefa06: Merge "Fix one NPE in tethering setting"

* commit '9e96c453fb84ec4832bde217617958121947128b':
  Fix one NPE in tethering setting

11 years agoam a1fa7cef: am 1faefa06: Merge "Fix one NPE in tethering setting"
Robert Greenwalt [Thu, 15 Aug 2013 14:19:36 +0000 (07:19 -0700)]
am a1fa7cef: am 1faefa06: Merge "Fix one NPE in tethering setting"

* commit 'a1fa7cef5d88d0f515efa07d0f7274c41fa6d712':
  Fix one NPE in tethering setting

11 years agoam 1faefa06: Merge "Fix one NPE in tethering setting"
Robert Greenwalt [Thu, 15 Aug 2013 14:17:11 +0000 (07:17 -0700)]
am 1faefa06: Merge "Fix one NPE in tethering setting"

* commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c':
  Fix one NPE in tethering setting

11 years agoMerge "Fix one NPE in tethering setting"
Robert Greenwalt [Thu, 15 Aug 2013 14:13:09 +0000 (14:13 +0000)]
Merge "Fix one NPE in tethering setting"

11 years agoFix one NPE in tethering setting
Jianzheng Zhou [Thu, 15 Aug 2013 06:34:52 +0000 (14:34 +0800)]
Fix one NPE in tethering setting

Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.

Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
11 years agoShows "App Info" for system apps
Lifu Tang [Thu, 15 Aug 2013 00:25:12 +0000 (17:25 -0700)]
Shows "App Info" for system apps

If a specific Uid contains only one package, we show the "App Info"
button, even if it's a system app

Change-Id: Ie39b6d90e62ae432c636d50729f0aa45405ce67c

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Aug 2013 21:50:28 +0000 (14:50 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Aug 2013 21:46:29 +0000 (14:46 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Aug 2013 21:44:15 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Aug 2013 21:42:52 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam c4cdd59e: (-s ours) Reconcile with klp-release - do not merge
The Android Open Source Project [Wed, 14 Aug 2013 21:30:02 +0000 (14:30 -0700)]
am c4cdd59e: (-s ours) Reconcile with klp-release - do not merge

* commit 'c4cdd59e025e574a78c47bb6db83b31e46e66b04':
  Fix bug when sharing to bluetooth.
  Fix for TTS settings crash.
  Restriction pin changes.
  Remove Restrictions UI
  Add some missing fragments to the whitelist
  Potential fix for Settings instability on x-large.
  Fix accidental creation of restriction entry for required apps
  Fix broken strings in Settings
  Always allow formatting of physical storage.
  Guard against missing terminal app.

11 years agoReconcile with klp-release - do not merge
The Android Open Source Project [Wed, 14 Aug 2013 21:25:51 +0000 (14:25 -0700)]
Reconcile with klp-release - do not merge

Change-Id: Ibab39b9c65854cd80f8b125eace08eea87fb4a95

11 years agoam 9995bcbc: am fcfd865d: Merge "NFC: Allow to get result from tap-pay default dialog...
Martijn Coenen [Wed, 14 Aug 2013 16:02:30 +0000 (09:02 -0700)]
am 9995bcbc: am fcfd865d: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev

* commit '9995bcbc820a2ef923dd77b0dfa100b754c9efe6':
  NFC: Allow to get result from tap-pay default dialog.

11 years agoam fcfd865d: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
Martijn Coenen [Wed, 14 Aug 2013 16:00:01 +0000 (09:00 -0700)]
am fcfd865d: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev

* commit 'fcfd865d5c1f2e20952d64196922840a63e83411':
  NFC: Allow to get result from tap-pay default dialog.

11 years agoMerge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
Martijn Coenen [Wed, 14 Aug 2013 15:58:06 +0000 (15:58 +0000)]
Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev

11 years agoNFC: Allow to get result from tap-pay default dialog.
Martijn Coenen [Wed, 14 Aug 2013 15:57:11 +0000 (08:57 -0700)]
NFC: Allow to get result from tap-pay default dialog.

Change-Id: Ic9e88dca5577a4f553dca56e0ff387c1e96f2ed2

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 14 Aug 2013 13:06:53 +0000 (06:06 -0700)]
merge in klp-release history after reset to klp-dev

11 years agoam 0574c26c: am cabe7e82: Merge "Settings app supports location settings injection...
Tom O'Neill [Wed, 14 Aug 2013 00:37:55 +0000 (17:37 -0700)]
am 0574c26c: am cabe7e82: Merge "Settings app supports location settings injection" into klp-dev

* commit '0574c26c36b1b760d80107fb4171cdcb642aabf1':
  Settings app supports location settings injection

11 years agoam cabe7e82: Merge "Settings app supports location settings injection" into klp-dev
Tom O'Neill [Wed, 14 Aug 2013 00:34:20 +0000 (17:34 -0700)]
am cabe7e82: Merge "Settings app supports location settings injection" into klp-dev

* commit 'cabe7e821886f560e2bff7d2528069308458dc98':
  Settings app supports location settings injection

11 years agoMerge "Settings app supports location settings injection" into klp-dev
Tom O'Neill [Wed, 14 Aug 2013 00:30:30 +0000 (00:30 +0000)]
Merge "Settings app supports location settings injection" into klp-dev

11 years agoFix bug when sharing to bluetooth.
Maggie Benthall [Mon, 12 Aug 2013 22:40:45 +0000 (18:40 -0400)]
Fix bug when sharing to bluetooth.

Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df

11 years agoFix for TTS settings crash.
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 12:05:48 +0000 (13:05 +0100)]
Fix for TTS settings crash.

Play an example is wrongly enabled before TTS engine is initialized.

Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef

11 years agoam fa6faf95: am cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev
Maggie Benthall [Tue, 13 Aug 2013 17:05:36 +0000 (10:05 -0700)]
am fa6faf95: am cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev

* commit 'fa6faf95bc70fee95093f7c7bd1b6a540a95fe03':
  Fix bug when sharing to bluetooth.

11 years agoam cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev
Maggie Benthall [Tue, 13 Aug 2013 17:04:09 +0000 (10:04 -0700)]
am cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev

* commit 'cd3eb97ce57e9811cb7129d4d493a08480e9a56e':
  Fix bug when sharing to bluetooth.

11 years agoMerge "Fix bug when sharing to bluetooth." into klp-dev
Maggie Benthall [Tue, 13 Aug 2013 17:00:24 +0000 (17:00 +0000)]
Merge "Fix bug when sharing to bluetooth." into klp-dev

11 years agoam d92af47f: am 0e01f128: Fix for TTS settings crash.
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 13:44:49 +0000 (06:44 -0700)]
am d92af47f: am 0e01f128: Fix for TTS settings crash.

* commit 'd92af47f9369f50edac2d5c36f78aee4997bbe8d':
  Fix for TTS settings crash.

11 years agoam 0e01f128: Fix for TTS settings crash.
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 13:43:09 +0000 (06:43 -0700)]
am 0e01f128: Fix for TTS settings crash.

* commit '0e01f128ab8a8525a4d3fd72980e468f4de1e56c':
  Fix for TTS settings crash.

11 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 13 Aug 2013 13:04:16 +0000 (06:04 -0700)]
merge in klp-release history after reset to klp-dev

11 years agoFix for TTS settings crash.
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 12:05:48 +0000 (13:05 +0100)]
Fix for TTS settings crash.

Play an example is wrongly enabled before TTS engine is initialized.

Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef

11 years agoam 3b3a8b09: (-s ours) am 0782e629: (-s ours) am 508997ad: (-s ours) am 728da455...
Baligh Uddin [Tue, 13 Aug 2013 07:56:28 +0000 (00:56 -0700)]
am 3b3a8b09: (-s ours) am 0782e629: (-s ours) am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE

* commit '3b3a8b097225a5667e4ad69ac3fb9e6e1bf89f9c':
  Import translations. DO NOT MERGE

11 years agoam 0782e629: (-s ours) am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0...
Baligh Uddin [Tue, 13 Aug 2013 07:53:52 +0000 (00:53 -0700)]
am 0782e629: (-s ours) am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE

* commit '0782e6293bec6f51e5ecd23525f945823e5b4632':
  Import translations. DO NOT MERGE

11 years agoam 965d7569: (-s ours) am fff94ce8: (-s ours) am 08f1d439: (-s ours) am 05404105...
Baligh Uddin [Tue, 13 Aug 2013 07:51:57 +0000 (00:51 -0700)]
am 965d7569: (-s ours) am fff94ce8: (-s ours) am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE

* commit '965d756920d556d95178d48127ee14abcda85916':
  Import translations. DO NOT MERGE

11 years agoam 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translati...
Baligh Uddin [Tue, 13 Aug 2013 07:48:30 +0000 (00:48 -0700)]
am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE

* commit '508997ad0729e16eb04c475f9be3e33ca5ed60cf':
  Import translations. DO NOT MERGE

11 years agoam b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:47:30 +0000 (00:47 -0700)]
am b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam fff94ce8: (-s ours) am 08f1d439: (-s ours) am 05404105: (-s ours) Import translati...
Baligh Uddin [Tue, 13 Aug 2013 07:47:21 +0000 (00:47 -0700)]
am fff94ce8: (-s ours) am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:45:32 +0000 (00:45 -0700)]
am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE

* commit '728da4558087e5b3fe25fad7eedb4f5de5c4068f':
  Import translations. DO NOT MERGE

11 years agoam 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:44:04 +0000 (00:44 -0700)]
am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE

* commit '08f1d439c7a278b0cd9afd60f2ba41e846f40543':
  Import translations. DO NOT MERGE

11 years agoam a45cd5a6: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:43:55 +0000 (00:43 -0700)]
am a45cd5a6: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam 03ae9bf0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:42:15 +0000 (00:42 -0700)]
am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE

* commit '03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
  Import translations. DO NOT MERGE

11 years agoam 05404105: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:42:11 +0000 (00:42 -0700)]
am 05404105: (-s ours) Import translations. DO NOT MERGE

* commit '054041058f9706c95b3d72ca421fcb656ad59d1e':
  Import translations. DO NOT MERGE

11 years agoSettings app supports location settings injection
Tom O'Neill [Mon, 12 Aug 2013 23:22:48 +0000 (16:22 -0700)]
Settings app supports location settings injection

- Partial fix for b/10287745

Change-Id: Ia5eb05670957125e70717c86a686a54b77b22455

11 years agoFix bug when sharing to bluetooth.
Maggie Benthall [Mon, 12 Aug 2013 22:40:45 +0000 (18:40 -0400)]
Fix bug when sharing to bluetooth.

Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 12 Aug 2013 18:54:53 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 12 Aug 2013 18:51:11 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE

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