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

12204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
8df4caf168 am d866be38: (-s ours) am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE 
* commit 'd866be382b330ae6c96dfe0de66f2426945b7730':
  Import translations. DO NOT MERGE
 2013-08-27 19:42:22 -07:00
Baligh Uddin
d866be382b am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE 
* commit '1caeb5a11d4846c5db9741c914b1ba53b0af6dc9':
  Import translations. DO NOT MERGE
 2013-08-27 19:40:21 -07:00
Baligh Uddin
26a4b208ef am 56fc8b77: (-s ours) am 04a25289: (-s ours) Import translations. DO NOT MERGE 
* commit '56fc8b77643411ca8c43b0f3d178c3804de7093b':
  Import translations. DO NOT MERGE
 2013-08-27 19:39:03 -07:00
Baligh Uddin
35ce85d60d am 3c1f138b: (-s ours) am f92ee425: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '3c1f138b979bd02884aaefb50a397e2e03334f6c':
  Import translations. DO NOT MERGE
 2013-08-27 19:38:46 -07:00
Baligh Uddin
56fc8b7764 am 04a25289: (-s ours) Import translations. DO NOT MERGE 
* commit '04a252899bdd8a798d1a9c90c2ab45f9efdba5a8':
  Import translations. DO NOT MERGE
 2013-08-27 19:37:03 -07:00
Baligh Uddin
3c1f138b97 am f92ee425: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f92ee42545af691b1aa032735009c89d09063a38':
  Import translations. DO NOT MERGE
 2013-08-27 19:36:55 -07:00
Baligh Uddin
1caeb5a11d am d8c9c146: (-s ours) Import translations. DO NOT MERGE 
* commit 'd8c9c146e79636f44808e2514e666f0966cc5596':
  Import translations. DO NOT MERGE
 2013-08-27 19:36:48 -07:00
Baligh Uddin
c6e3e37f9a Merge "Import translations. DO NOT MERGE" 2013-08-28 02:34:36 +00:00
Baligh Uddin
f92ee42545 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 02:34:25 +00:00
Maggie Benthall
c7b633367a am b1755b37: am 9506d857: Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev 
* commit 'b1755b37fc3463e2a73852cd72883c56861f2597':
  Fix NPE in SecuritySettings.onResume()
 2013-08-27 17:05:38 -07:00
Maggie Benthall
b1755b37fc am 9506d857: Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev 
* commit '9506d857cbc87a3dcedc8c3599f1d45ac6fe995e':
  Fix NPE in SecuritySettings.onResume()
 2013-08-27 17:03:31 -07:00
Maggie Benthall
9506d857cb Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev 2013-08-28 00:00:01 +00:00
Amith Yamasani
488c719482 am 90f5d21d: am cb6ba728: Merge "Don\'t list apps that are disabled by the system" into klp-dev 
* commit '90f5d21d40cec38762527583df84f0dfadd1dc5c':
  Don't list apps that are disabled by the system
 2013-08-27 14:48:34 -07:00
Amith Yamasani
90f5d21d40 am cb6ba728: Merge "Don\'t list apps that are disabled by the system" into klp-dev 
* commit 'cb6ba728c5f872bc66e3b8ac3682b350cb7501f0':
  Don't list apps that are disabled by the system
 2013-08-27 14:45:57 -07:00
Amith Yamasani
cb6ba728c5 Merge "Don't list apps that are disabled by the system" into klp-dev 2013-08-27 21:42:58 +00:00
Alan Viverette
5ea751e48f Update captioning settings to match revised API 
BUG: 10461210
Change-Id: I44d1fdeaead4357ff2591db6d9dda1c8a231103c
 2013-08-27 11:11:00 -07:00
Tom O'Neill
7cacbab8c4 am ca51ca84: am 9066b914: Merge "Switch to new location mode API recommended by API council" into klp-dev 
* commit 'ca51ca84f6dddee0521f0aa362969fc9fdbaeb6e':
  Switch to new location mode API recommended by API council
 2013-08-27 10:30:37 -07:00
Tom O'Neill
fb096818b9 am 4d6aaf30: am 5d821bed: Merge "Adapt to SettingsInjectorService API changes" into klp-dev 
* commit '4d6aaf30eabbeb00a31958b5752872ecc3b401fa':
  Adapt to SettingsInjectorService API changes
 2013-08-27 10:30:29 -07:00
Tom O'Neill
ca51ca84f6 am 9066b914: Merge "Switch to new location mode API recommended by API council" into klp-dev 
* commit '9066b9140c376cb1b66a3eee830d9dfa177c6056':
  Switch to new location mode API recommended by API council
 2013-08-27 08:51:04 -07:00
Tom O'Neill
9066b9140c Merge "Switch to new location mode API recommended by API council" into klp-dev 2013-08-27 15:48:34 +00:00
Tom O'Neill
4d6aaf30ea am 5d821bed: Merge "Adapt to SettingsInjectorService API changes" into klp-dev 
* commit '5d821bedb1f065702b9920fe15a6f81bc19ba36b':
  Adapt to SettingsInjectorService API changes
 2013-08-27 07:42:52 -07:00
Tom O'Neill
5d821bedb1 Merge "Adapt to SettingsInjectorService API changes" into klp-dev 2013-08-27 14:38:07 +00:00
The Android Automerger
61ad29ae12 merge in klp-release history after reset to klp-dev 2013-08-27 06:02:13 -07:00
Alan Viverette
ad4366a871 am 14983f09: am 0f9a405f: Fix APN preference style 
* commit '14983f099c98ab89bde035182c32c2a58daec3a4':
  Fix APN preference style
 2013-08-26 15:09:40 -07:00
Tom O'Neill
e75e4d8f9b am 0af71e25: am cbf589e7: Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev 
* commit '0af71e25f3cfcfdd1a16d0bee3e94868b9859201':
  Handle races caused by rapid settings changed broadcasts
 2013-08-26 15:09:39 -07:00
Jim Miller
f9e4337890 am ca436417: am f6794f95: Merge "Add setting to disable keyguard widgets" into klp-dev 
* commit 'ca436417875bacc337080a7066395ca1ca0b2492':
  Add setting to disable keyguard widgets
 2013-08-26 15:09:38 -07:00
Amith Yamasani
f7fc44d35e am 23f4337b: am 2a570787: Merge "Fix incorrect comparison" into klp-dev 
* commit '23f4337ba44b26e229e8886c4ac75abf41060a39':
  Fix incorrect comparison
 2013-08-26 15:09:38 -07:00
Lifu Tang
541cdaafd0 am 2110efe5: am 85dfc900: Merge "Allows multi-line message on small-screen devices" into klp-dev 
* commit '2110efe50f24606c9c44711321b5600d2de50964':
  Allows multi-line message on small-screen devices
 2013-08-26 15:09:37 -07:00
Chong Zhang
8a7164c33a am 41bfb63f: am 5114444e: Merge "wifi-display: add certification options" into klp-dev 
* commit '41bfb63ff90d3791099455aef59738d841b5f3e5':
  wifi-display: add certification options
 2013-08-26 15:09:37 -07:00
Baligh Uddin
51ec520da5 am 85e494ae: (-s ours) am a0aee43e: (-s ours) Import translations. DO NOT MERGE 
* commit '85e494ae851522699f1a4c80781ad55b5dc2fe14':
  Import translations. DO NOT MERGE
 2013-08-26 15:09:36 -07:00
Alan Viverette
14983f099c am 0f9a405f: Fix APN preference style 
* commit '0f9a405fd58f8f5d30fbbe975e063e324d46a1f2':
  Fix APN preference style
 2013-08-26 15:05:38 -07:00
Tom O'Neill
0af71e25f3 am cbf589e7: Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev 
* commit 'cbf589e73cd8b9a62c413c804b698e489f44c403':
  Handle races caused by rapid settings changed broadcasts
 2013-08-26 15:03:54 -07:00
Jim Miller
ca43641787 am f6794f95: Merge "Add setting to disable keyguard widgets" into klp-dev 
* commit 'f6794f95d19306e0f8a1edf02670d8dabd6daa5f':
  Add setting to disable keyguard widgets
 2013-08-26 15:03:23 -07:00
Amith Yamasani
23f4337ba4 am 2a570787: Merge "Fix incorrect comparison" into klp-dev 
* commit '2a5707874b6ec39798421f77e0ccf38dbaa1e65f':
  Fix incorrect comparison
 2013-08-26 15:03:22 -07:00
Lifu Tang
2110efe50f am 85dfc900: Merge "Allows multi-line message on small-screen devices" into klp-dev 
* commit '85dfc9009fdad338cdda62cbcc549fde8479bdce':
  Allows multi-line message on small-screen devices
 2013-08-26 15:03:19 -07:00
Chong Zhang
41bfb63ff9 am 5114444e: Merge "wifi-display: add certification options" into klp-dev 
* commit '5114444eca4e62f32cc85b9740dc0c66f87d5d99':
  wifi-display: add certification options
 2013-08-26 15:03:07 -07:00
Baligh Uddin
85e494ae85 am a0aee43e: (-s ours) Import translations. DO NOT MERGE 
* commit 'a0aee43e8463516ded9b3ab784d53bdf9ccf87c2':
  Import translations. DO NOT MERGE
 2013-08-26 15:00:50 -07:00
Tom O'Neill
93259c14f3 Switch to new location mode API recommended by API council 
- Part of b/10461763 fix

Change-Id: I202ce4c817f24a1682796e92fed9cc3efcc31a81
 2013-08-26 14:40:54 -07:00
Baligh Uddin
1d619e1ead Import translations. DO NOT MERGE 
Change-Id: I62ee2b860598c7e98e6a1ad74f80a086b1da2d77
Auto-generated-cl: translation import
 2013-08-26 14:06:36 -07:00
Baligh Uddin
b0de3b5ddf Import translations. DO NOT MERGE 
Change-Id: Ibf7604d13d020201dd350b35765da372c2f9fbbb
Auto-generated-cl: translation import
 2013-08-26 13:59:51 -07:00
Baligh Uddin
04a252899b Import translations. DO NOT MERGE 
Change-Id: I46db6a6657e5528bbb4a84187f9b271baf644843
Auto-generated-cl: translation import
 2013-08-26 13:55:54 -07:00
Baligh Uddin
d8c9c146e7 Import translations. DO NOT MERGE 
Change-Id: Iddf40541878ef237a1890dad5c3d16e4132d6dde
Auto-generated-cl: translation import
 2013-08-26 13:54:28 -07:00
Alan Viverette
0f9a405fd5 Fix APN preference style 
BUG: 10445477
Change-Id: Ie1ce786ce49e1b68ffd38f6908189b8241773838
 2013-08-26 13:25:59 -07:00
Tom O'Neill
b578ac4f94 Adapt to SettingsInjectorService API changes 
- Part of fix for b/10461474

Change-Id: Ia37f444afc822a42ec21ebd2beae7aef8642547a
 2013-08-26 09:47:55 -07:00
Tom O'Neill
cbf589e73c Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev 2013-08-26 14:33:38 +00:00
The Android Automerger
f340397c25 merge in klp-release history after reset to klp-dev 2013-08-26 06:01:38 -07:00
Jim Miller
f6794f95d1 Merge "Add setting to disable keyguard widgets" into klp-dev 2013-08-24 01:28:40 +00:00
Amith Yamasani
2a5707874b Merge "Fix incorrect comparison" into klp-dev 2013-08-24 01:23:06 +00:00
Amith Yamasani
39272d07d7 Fix incorrect comparison 
Bug: 10446469

Screen lock options should have been locked down when encryption is
enabled. An incorrect comparison (== instead of equals) caused it
to always bypass encryption quality check.

Change-Id: I7f3856146181a92183555f30bbc50d58bfe0c3d5
 2013-08-23 18:07:30 -07:00
Lifu Tang
85dfc9009f Merge "Allows multi-line message on small-screen devices" into klp-dev 2013-08-24 00:00:36 +00:00