Commit Graph

11183 Commits

Author SHA1 Message Date
Alan Viverette
16ad25665e am bffd631a: Allow the framework to recycle ApnPreference views
* commit 'bffd631a2ab08c4313ae6405b9a8803bc98b629b':
  Allow the framework to recycle ApnPreference views
2013-08-20 19:00:32 -07:00
Alan Viverette
bffd631a2a Allow the framework to recycle ApnPreference views
BUG: 10079104
Change-Id: Iaa4f155da12a141f16300076cc820d47e0c5779a
2013-08-20 18:14:33 -07:00
Alan Viverette
976590843a am 35bac199: Merge "Fix background and line wrapping in CaptionTextView" into klp-dev
* commit '35bac199324d07dd6cf16e3bd50df1feca8e9030':
  Fix background and line wrapping in CaptionTextView
2013-08-20 16:50:04 -07:00
Alan Viverette
35bac19932 Merge "Fix background and line wrapping in CaptionTextView" into klp-dev 2013-08-20 23:46:20 +00:00
Alan Viverette
c30f124c91 Fix background and line wrapping in CaptionTextView
Also fixes where two style names were accidentally switched,
makes the font sizes larger, and cleans up the CaptionTextView
styling APIs in preparation for moving it into the framework.

BUG: 10396663
Change-Id: I00999723a67bce2659d913b70dd4420ed32f955c
2013-08-20 15:58:38 -07:00
Amith Yamasani
8551bcf59c am 0f5578ce: Merge "Select max timeout, if it\'s in the timeout list" into klp-dev
* commit '0f5578ce2ddfc19eab36e843728470e8119026b5':
  Select max timeout, if it's in the timeout list
2013-08-20 13:35:29 -07:00
Amith Yamasani
0f5578ce2d Merge "Select max timeout, if it's in the timeout list" into klp-dev 2013-08-20 20:33:24 +00:00
Lifu Tang
96dd39badd am d3dbc6e3: Launches the Location setting as fragment
* commit 'd3dbc6e3a187b9de69b83915400425032d287dec':
  Launches the Location setting as fragment
2013-08-19 19:01:08 -07:00
Lifu Tang
d3dbc6e3a1 Launches the Location setting as fragment
Change-Id: I0fb04a346236676ce9483a0c4d1fc3b2b590b08c
2013-08-19 18:42:56 -07:00
Lifu Tang
2e45637aeb am b9ab196b: Sort recent apps, show message when no recent apps
* commit 'b9ab196bb520fed9b23aa9a259fab08084646c2c':
  Sort recent apps, show message when no recent apps
2013-08-19 18:33:08 -07:00
Lifu Tang
b9ab196bb5 Sort recent apps, show message when no recent apps
Change-Id: I70bb1913435b46fc87aec10075e43f98ef07ef62
2013-08-19 17:56:14 -07:00
Lifu Tang
0acf3cfc8c am dbd2f759: Merge "Supress Location button when coming from Location" into klp-dev
* commit 'dbd2f7592943f49dd8227f01fa9c5d14e4e58c0b':
  Supress Location button when coming from Location
2013-08-19 14:37:09 -07:00
Lifu Tang
dbd2f75929 Merge "Supress Location button when coming from Location" into klp-dev 2013-08-19 21:33:22 +00:00
Christopher Tate
88d83a901f 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
2013-08-19 14:20:50 -07:00
Christopher Tate
c7679b0ef2 Merge "Don't crash when procstats has data for a now-disused uid" into klp-dev 2013-08-19 21:19:11 +00:00
Lifu Tang
bfa96c3b10 Supress Location button when coming from Location
Change-Id: Ie1f1aed17206530ec7c8a1cde43a4380b7232823
2013-08-19 14:15:52 -07:00
Baligh Uddin
9378f59507 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
2013-08-19 13:13:07 -07:00
Baligh Uddin
6a5c9a83d6 am 1df37ff1: (-s ours) am 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE
* commit '1df37ff1b1761ed6124e1ff1abcfb4c0d60f6c77':
  Import translations. DO NOT MERGE
2013-08-19 13:09:43 -07:00
Baligh Uddin
55b57ed7d5 am 05e3f627: (-s ours) am 5c601791: (-s ours) am 8485f115: (-s ours) Import translations. DO NOT MERGE
* commit '05e3f627477053b1568558de5454b7b5e8b5805d':
  Import translations. DO NOT MERGE
2013-08-19 13:09:36 -07:00
Baligh Uddin
3bcfffca91 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
2013-08-19 13:09:35 -07:00
Baligh Uddin
05e3f62747 am 5c601791: (-s ours) am 8485f115: (-s ours) Import translations. DO NOT MERGE
* commit '5c601791074c2275bd42ad8c6798ef39b13e0a6d':
  Import translations. DO NOT MERGE
2013-08-19 13:06:15 -07:00
Baligh Uddin
b0130e7b9c am 21cbd017: (-s ours) am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE
* commit '21cbd017a3201639097cda31c59f769d1cc2b739':
  Import translations. DO NOT MERGE
2013-08-19 13:06:14 -07:00
Baligh Uddin
1df37ff1b1 am 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE
* commit '2b85185988eec44b6fdd3ee072d44b0a7a72d432':
  Import translations. DO NOT MERGE
2013-08-19 13:04:58 -07:00
Baligh Uddin
6d3d55e613 am c7ec87f1: (-s ours) Import translations. DO NOT MERGE
* commit 'c7ec87f1db5081efe038ee0da3aae7ccd830612e':
  Import translations. DO NOT MERGE
2013-08-19 13:02:18 -07:00
Baligh Uddin
2b85185988 am b09878b8: (-s ours) Import translations. DO NOT MERGE
* commit 'b09878b85044df1032eb4612b3165216388165ac':
  Import translations. DO NOT MERGE
2013-08-19 13:01:53 -07:00
Baligh Uddin
5c60179107 am 8485f115: (-s ours) Import translations. DO NOT MERGE
* commit '8485f115d25968c0fa3ab9d1ea42d2751422feb5':
  Import translations. DO NOT MERGE
2013-08-19 13:00:37 -07:00
Baligh Uddin
21cbd017a3 am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE
* commit 'e37538b122199f316b8b8eb76a6445de6f5c83be':
  Import translations. DO NOT MERGE
2013-08-19 13:00:36 -07:00
Baligh Uddin
c7ec87f1db Import translations. DO NOT MERGE
Change-Id: Ice096be39ce880f1a777c969b0bfb7e2987ec888
Auto-generated-cl: translation import
2013-08-19 12:08:24 -07:00
Baligh Uddin
8485f115d2 Import translations. DO NOT MERGE
Change-Id: Id76ef34b16fb0979b5b86c5e04b60e0d3088c54a
Auto-generated-cl: translation import
2013-08-19 12:04:34 -07:00
Baligh Uddin
b09878b850 Import translations. DO NOT MERGE
Change-Id: I3c136ce6349c35f3cec69d12f355daaf1e8912b5
Auto-generated-cl: translation import
2013-08-19 12:03:06 -07:00
Christopher Tate
a218e732b0 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
2013-08-18 17:26:48 -07:00
Amith Yamasani
78b8265b17 Select max timeout, if it's in the timeout list
Bug: 10192592
Change-Id: I21ec208abf0c8659233cdb5219d9b226528aa1d4
2013-08-16 16:35:54 -07:00
Amith Yamasani
905c00a405 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
2013-08-15 18:09:06 -07:00
Amith Yamasani
55fe056d96 Merge "Don't apply encryption password requirements for secondary users" into klp-dev 2013-08-16 01:04:51 +00:00
Baligh Uddin
44a224cabf am 239c79c8: (-s ours) am a7238c18: (-s ours) am dbf26e70: (-s ours) Import translations. DO NOT MERGE
* commit '239c79c8d7f4b7c29c66f199eb7a5813b546ecb2':
  Import translations. DO NOT MERGE
2013-08-15 17:57:48 -07:00
Baligh Uddin
239c79c8d7 am a7238c18: (-s ours) am dbf26e70: (-s ours) Import translations. DO NOT MERGE
* commit 'a7238c18b0b5a4500bc0b7a93ddcf4068d45fcd1':
  Import translations. DO NOT MERGE
2013-08-15 17:54:13 -07:00
Baligh Uddin
e37538b122 am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE
* commit '8c6de9e052810aeec7a347bd015e7e8bf2c337cc':
  Import translations. DO NOT MERGE
2013-08-15 17:48:11 -07:00
Baligh Uddin
a7238c18b0 am dbf26e70: (-s ours) Import translations. DO NOT MERGE
* commit 'dbf26e70a1f546f9e198a72b2218ae99b015c9e6':
  Import translations. DO NOT MERGE
2013-08-15 17:48:05 -07:00
Baligh Uddin
28132bfd3e am eff5cd87: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'eff5cd87f1de04c06880774c8fd3e3b230c16503':
  Import translations. DO NOT MERGE
2013-08-15 17:47:37 -07:00
Baligh Uddin
eff5cd87f1 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-16 00:44:53 +00:00
Zhihai Xu
97fb8dbbe8 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)
2013-08-15 17:24:54 -07:00
Zhihai Xu
3d74aeaa85 Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev 2013-08-16 00:22:33 +00:00
Lifu Tang
5c12d789f5 am c3e9ac93: Linked the recent location apps to battery page
* commit 'c3e9ac937a4ba948d47cbb83f6999af34fd00b65':
  Linked the recent location apps to battery page
2013-08-15 16:59:25 -07:00
Amith Yamasani
12411fba8e Don't apply encryption password requirements for secondary users
Bug: 10314289
Change-Id: I54a54f910c914b41abd3e18963b4bd0c3cddb34a
2013-08-15 15:35:49 -07:00
Andre Eisenbach
79f3384eaa LE: Add support for the HID-over-GATT profile (3/3)
bug:8330048
Change-Id: I0999c3af999939aec88eba4c38bca4358c554e69
2013-08-15 15:21:27 -07:00
Lifu Tang
c3e9ac937a 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
2013-08-15 14:49:08 -07:00
Lifu Tang
adb9f2b992 am 5db411db: Merge "Shows "App Info" for system apps" into klp-dev
* commit '5db411db9881ea9ec48f2a607b711d8daa74d1ca':
  Shows "App Info" for system apps
2013-08-15 12:17:03 -07:00
Lifu Tang
5db411db98 Merge "Shows "App Info" for system apps" into klp-dev 2013-08-15 19:13:42 +00:00
Robert Greenwalt
9e96c453fb am a1fa7cef: am 1faefa06: Merge "Fix one NPE in tethering setting"
* commit 'a1fa7cef5d88d0f515efa07d0f7274c41fa6d712':
  Fix one NPE in tethering setting
2013-08-15 07:19:36 -07:00
Robert Greenwalt
a1fa7cef5d am 1faefa06: Merge "Fix one NPE in tethering setting"
* commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c':
  Fix one NPE in tethering setting
2013-08-15 07:17:11 -07:00