PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,437 Commits 1 Branch 0 Tags
f0286eaad6c2921124f6c6fbe8c5964b70e6268c
Commit Graph

11437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
f5aeec011a am 97659084: am 35bac199: Merge "Fix background and line wrapping in CaptionTextView" into klp-dev 
* commit '976590843aa26bd37501abbfe9d2a98da695c04f':
  Fix background and line wrapping in CaptionTextView
 2013-08-20 16:52:58 -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
Amith Yamasani
d760a61936 Fix custom restrictions launch mechanism 
Instead of showing a separate entry for launching custom restrictions,
launch it directly when clicking on the settings icon.

Bug: 10388399
Change-Id: I327d6d4c2b9840ce5ba140746568c5561a1a8936
 2013-08-20 16:26:48 -07: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
David Christie
512183ea8e Switch location Settings and Power widget to use new Settings api. 
Change-Id: I06b7a2e21876a18d9ad42fda2a6c6d4c7b6add48
 2013-08-20 15:24:21 -07:00
Amith Yamasani
05139a26f4 am 8551bcf5: am 0f5578ce: Merge "Select max timeout, if it\'s in the timeout list" into klp-dev 
* commit '8551bcf59c9555d9ed993e05712cc74b764c7f60':
  Select max timeout, if it's in the timeout list
 2013-08-20 13:37:51 -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
Maggie Benthall
f48206e37e Fix NPE in SecuritySettings.onResume() 
when DISALLOW_CONFIG_CREDENTIALS is true.

Bug: 10405192
Change-Id: Id364ba3cd86151b504158bc253559d0da5e26273
 2013-08-20 11:03:05 -04:00
Lifu Tang
41935ba6ba am 96dd39ba: am d3dbc6e3: Launches the Location setting as fragment 
* commit '96dd39badd1d82e1db360b77849ee26198a7d1c9':
  Launches the Location setting as fragment
 2013-08-19 19:04:04 -07: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
c0fc7457fc am 2e45637a: am b9ab196b: Sort recent apps, show message when no recent apps 
* commit '2e45637aeb775832b71a69fb26c5b6b754688960':
  Sort recent apps, show message when no recent apps
 2013-08-19 18:35:52 -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
f90b70378b am 0acf3cfc: am dbd2f759: Merge "Supress Location button when coming from Location" into klp-dev 
* commit '0acf3cfc8c55bac60295eb3f7e9ee6345186eb3c':
  Supress Location button when coming from Location
 2013-08-19 14:38:56 -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
4eb9db5b1c 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
 2013-08-19 14:22:47 -07: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
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
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