PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,871 Commits 1 Branch 0 Tags
04400ea2116770a8fbff0fd3c5101c65c194d4f9
Commit Graph

12871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
9bff610c91 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
 2013-08-19 13:14:28 -07:00
Baligh Uddin
9508ff6d56 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
 2013-08-19 13:14:27 -07:00
Baligh Uddin
7b0d683717 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
 2013-08-19 13:14:27 -07:00
Tom O'Neill
4a70f652ad Move UPDATE_INTENT to SettingsInjectorService 
Change-Id: I657c799b791e49e4af097f3cc4afdaa8f48325ac
 2013-08-19 13:13:25 -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
9c6815a14c am 6d3d55e6: (-s ours) am c7ec87f1: (-s ours) Import translations. DO NOT MERGE 
* commit '6d3d55e6138f18850e8116716efec06292ccc194':
  Import translations. DO NOT MERGE
 2013-08-19 13:07:24 -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
50d2f8b794 Import translations. DO NOT MERGE 
Change-Id: I5f89a996c28fbe668105892be7d40eec26065de3
Auto-generated-cl: translation import
 2013-08-19 12:14:29 -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
The Android Automerger
233e23c4b6 merge in klp-release history after reset to klp-dev 2013-08-19 06:02:39 -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
928191881d Don't list apps that are disabled by the system 
This is to make sure that apps that were disabled for some reason
such as inappropriateness for a locale or for a specific device, don't
show up as available to enable for a restricted profile.

But in the case that the app was already enabled for the target profile,
show it in the list so that it can be disabled if necessary.

Bug: 10229133
Change-Id: I3c19edb7364cea42d95b619781e0326543b9a1cf
 2013-08-16 13:59:40 -07:00
Amith Yamasani
bf3bc31da9 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
 2013-08-15 18:11:30 -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
4cd3161d7b 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
 2013-08-15 18:01:09 -07: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
5fffedd507 am 28132bfd: (-s ours) am eff5cd87: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '28132bfd3e5c99828fe0092c6f7ebe5156b23524':
  Import translations. DO NOT MERGE
 2013-08-15 17:49:20 -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
e60ed08cc4 Merge "Import translations. DO NOT MERGE" 2013-08-16 00:45:11 +00:00
Baligh Uddin
eff5cd87f1 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-16 00:44:53 +00:00
Zhihai Xu
1aa938ea56 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)
 2013-08-15 17:28:39 -07: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
b2877651df am 5c12d789: am c3e9ac93: Linked the recent location apps to battery page 
* commit '5c12d789f520b5b9542c6826c521490a16aa9ee0':
  Linked the recent location apps to battery page
 2013-08-15 17:01:08 -07: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
bde5225714 am adb9f2b9: am 5db411db: Merge "Shows "App Info" for system apps" into klp-dev 
* commit 'adb9f2b9929d4aa9086902f5976388ed61181674':
  Shows "App Info" for system apps
 2013-08-15 12:19:05 -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
1a1bec1a97 am 9e96c453: am a1fa7cef: am 1faefa06: Merge "Fix one NPE in tethering setting" 
* commit '9e96c453fb84ec4832bde217617958121947128b':
  Fix one NPE in tethering setting
 2013-08-15 07:21:07 -07: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