PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,151 Commits 1 Branch 0 Tags
19a1a8c3f90b97a1258c249652c1849fecf2d0fc
Commit Graph

17151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
be63f07cd1 am 131d34ae: am c24310c9: am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev 
* commit '131d34aecdd3af3680ab54aebd6d46d6c6f8eedb':
 2014-09-19 04:46:05 +00:00
PauloftheWest
27f7e29680 am 44581c7f: am b448ea3a: am 7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev 
* commit '44581c7ffdbce9fc863134edbb9b652e663e7e84':
 2014-09-19 04:46:04 +00:00
Fabrice Di Meglio
ca0c4c5a26 am 1695f40e: am 842feb89: am 52a48226: Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev 
* commit '1695f40e527ecd66486016755a7d175e35521a0f':
 2014-09-19 04:46:03 +00:00
Fabrice Di Meglio
2c413b1840 am c1c10754: am 9786d300: am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev 
* commit 'c1c10754a649d1c28a42b5186c0e89a9a71de0f3':
 2014-09-19 04:46:02 +00:00
Wink Saville
d9e90ebb12 am c2c89bf8: am a535fcb5: am 418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit 'c2c89bf82f89b3913e61d922317f294a515d359c':
 2014-09-19 04:46:00 +00:00
Fabrice Di Meglio
480bd6869c am f6713c2a: am bcd1ff97: am b5caa647: Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev 
* commit 'f6713c2a17b1eb75e8545746daf676a0fc624a95':
 2014-09-19 04:45:58 +00:00
Dan Sandler
d008dbe4cf am bb533452: am 2f64d506: am b58b5127: Fix links to notification settings activities. 
* commit 'bb533452beb55b89bc247a0ea0e3ade265b65a0c':
 2014-09-19 04:45:56 +00:00
Vinit Deshpande
c1579332f4 am b89d1109: am 05725beb: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit 'b89d11098020108835873dabed9d5ce4472d09f2':
 2014-09-19 04:45:54 +00:00
Amith Yamasani
8c48cb2b25 am 25661d68: am 12997ecd: am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev 
* commit '25661d68fd333bc52a2b81bda3b9c338bbf93686':
 2014-09-19 04:45:51 +00:00
PauloftheWest
34cb17f11d am 4a20069d: am 43454701: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit '4a20069dc0acf2aec19e546c2521c594bf8a3fc0':
 2014-09-19 04:45:49 +00:00
Jason Monk
35512106c9 am 710b8857: am c8d9504e: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev 
* commit '710b8857a865371ddc24b18560b1045fb076cb73':
 2014-09-19 04:45:47 +00:00
Paul Lawrence
cf69db21c0 am f88a60f0: am 8826a64a: am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev 
* commit 'f88a60f09e1eaa989408c6b09f0b24ed876b9fb3':
 2014-09-19 04:45:45 +00:00
Maurice Lam
4fb9b8cb94 am 2b193bc9: am 8efe9278: am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev 
* commit '2b193bc952460afe5dcc6d837abd77a850147529':
 2014-09-19 04:45:43 +00:00
PauloftheWest
a2da46e329 am dbfc2fe1: am 9fef5db8: am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 
* commit 'dbfc2fe1b3205a005520dc4cc331d75ea41ead8b':
 2014-09-19 04:45:42 +00:00
Fabrice Di Meglio
5dad606d76 am 72c7d705: am 8bde623e: am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 
* commit '72c7d7052cfe2981c7a2531d8d7d0e42f33d7e81':
 2014-09-19 04:45:41 +00:00
Dan Sandler
e28f4f7f83 am 2a124922: am c8c5091f: am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 
* commit '2a1249225f072915d3fd3b4464fe91ff727e2031':
 2014-09-19 04:45:40 +00:00
PauloftheWest
a12082bad0 am 84acfc61: am a8d4b005: am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev 
* commit '84acfc617e669ffff87d183164298cef9ee421eb':
 2014-09-19 04:45:39 +00:00
Baligh Uddin
fb321799ca am 7ddba441: (-s ours) am 25728d22: (-s ours) am 48d3f0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '7ddba4418b89e3e66d97c842462fe39b396ed791':
 2014-09-19 04:45:37 +00:00
Baligh Uddin
f0c35720ed am 487e9235: (-s ours) am d7697f0f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '487e923551735452c76e32c29018b4862314772d':
  Import translations. DO NOT MERGE
 2014-09-19 04:45:36 +00:00
Wink Saville
1f4ead67c3 am ea569f48: am 98365869: ksd to lmp-sprout-dev 
* commit 'ea569f481756ece8f3945de8f1d4630842e2cde8':
  ksd to lmp-sprout-dev
 2014-09-19 04:45:35 +00:00
Matthew Xie
3d76c26887 am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit 'a93c4cae6df26926a8e8b054135c40c71f147226':
  Do not overwrite alias with device name
 2014-09-19 00:43:55 +00:00
Matthew Xie
a93c4cae6d am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit '72c34e6a956a54ed023d207b41f5d21365b15c38':
  Do not overwrite alias with device name
 2014-09-19 00:31:59 +00:00
Matthew Xie
72c34e6a95 Merge "Do not overwrite alias with device name" into lmp-dev 2014-09-19 00:23:34 +00:00
Matthew Xie
2f837509dd Do not overwrite alias with device name 
Bug: 17287682
Change-Id: Iea29e85125ae4720fd99f893f516c301b7aed7c6
 2014-09-18 22:54:22 +00:00
Paul Lawrence
ced7db460f Hide controls once password is known good 
Bug: 17551103
Change-Id: I4fd182b7ac7a9ad7c1483979d4510b50b52e520f
 2014-09-18 11:23:40 -07:00
PauloftheWest
7612e0d709 am 21afc838: am 50a53bdb: am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '21afc838de9cf6cc495ccba36dcbc7c014b06220':
  Removed an extraneous messge when pairing.
 2014-09-18 16:35:51 +00:00
PauloftheWest
b26eb21111 am 58da4c37: am c932957d: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '58da4c37276ba1102a4a524b2a56c0b5db0e477f':
  Removed an extraneous messge when pairing.
 2014-09-18 16:24:56 +00:00
PauloftheWest
21afc838de am 50a53bdb: am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '50a53bdbe39d4da11a493aa14cd085460e31f525':
  Removed an extraneous messge when pairing.
 2014-09-18 16:24:29 +00:00
PauloftheWest
58da4c3727 am c932957d: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit 'c932957d4e56c756acea56c11347b4da35a30983':
  Removed an extraneous messge when pairing.
 2014-09-18 16:12:14 +00:00
PauloftheWest
50a53bdbe3 am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit 'f6526146250ff68df0f8941fe0b91ae74d55ab8d':
  Removed an extraneous messge when pairing.
 2014-09-18 16:11:54 +00:00
PauloftheWest
f652614625 am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
  Removed an extraneous messge when pairing.
 2014-09-18 16:01:15 +00:00
PauloftheWest
c932957d4e am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
  Removed an extraneous messge when pairing.
 2014-09-18 16:00:59 +00:00
PauloftheWest
0f01eeff84 Merge "Removed an extraneous messge when pairing." into lmp-dev 2014-09-18 15:51:50 +00:00
Sander Alewijnse
18d99ceab6 am fc10b1e8: am 09c1ddc5: am b997bd50: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit 'fc10b1e8774a6a579bca3ff6546d73d4753197a1':
  Update targetSdkVersion check.
 2014-09-18 12:18:18 +00:00
Sander Alewijnse
61fc506eb3 am 0fe16796: am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '0fe16796c55091ed7b75f75fdeed5b0e5b03da30':
  Update targetSdkVersion check.
 2014-09-18 12:07:39 +00:00
Sander Alewijnse
fc10b1e877 am 09c1ddc5: am b997bd50: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '09c1ddc565c6d0954669b4c1642ad8218313bc84':
  Update targetSdkVersion check.
 2014-09-18 12:07:36 +00:00
Sander Alewijnse
0fe16796c5 am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit 'c995e73391bb4f46154d506f198ee4dec85bae4c':
  Update targetSdkVersion check.
 2014-09-18 11:56:32 +00:00
Sander Alewijnse
09c1ddc565 am b997bd50: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit 'b997bd50ec5962842c50b1fdf4a50995e7b2a251':
  Update targetSdkVersion check.
 2014-09-18 11:55:46 +00:00
Sander Alewijnse
c995e73391 am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '4241b0a9627e424adb897ec894a34ddce8fd77e3':
  Update targetSdkVersion check.
 2014-09-18 11:46:11 +00:00
Sander Alewijnse
b997bd50ec am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '4241b0a9627e424adb897ec894a34ddce8fd77e3':
  Update targetSdkVersion check.
 2014-09-18 11:45:44 +00:00
Sander Alewijnse
4241b0a962 Merge "Update targetSdkVersion check." into lmp-dev 2014-09-18 11:36:31 +00:00
Zoltan Szatmary-Ban
7a2ccf201e Show Power usage details for the correct user 
Settings > Battery > Details has to observe managed profiles and start the
Power Usage Detail fragment for the correct profile.

Bug: 17523189

Change-Id: I7a47b972a8a0492b4a411197cd2c8c65f24c2e7e
 2014-09-18 12:06:56 +01:00
Mark Salyzyn
218d49625b am b340d01e: am 9d690250: am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support 
* commit 'b340d01e2cd9564e61c73aa410a794055a46348b':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:59:12 +00:00
Mark Salyzyn
b340d01e2c am 9d690250: am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support 
* commit '9d690250b8f6b85d0471477f9385657cdeb4d3a3':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:49:59 +00:00
Mark Salyzyn
0e77a346bb am 22955813: am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support 
* commit '229558137318fdebce6b1bf3f5b30ea96e65a400':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:46:59 +00:00
Mark Salyzyn
2295581373 am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support 
* commit '5f288bc17c79c76090075db3a8a307c6421b9eb0':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:32:07 +00:00
Mark Salyzyn
9d690250b8 am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support 
* commit '66718d5a6e51d58a83b186bdd2cc1b6665d0020c':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:32:00 +00:00
Mark Salyzyn
5f288bc17c am 894af268: logd: settings: ro.config.low_ram support 
* commit '894af268def8a817306ea83f21cb25b6f0edf2e3':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:25:57 +00:00
Mark Salyzyn
66718d5a6e am 894af268: logd: settings: ro.config.low_ram support 
* commit '894af268def8a817306ea83f21cb25b6f0edf2e3':
  logd: settings: ro.config.low_ram support
 2014-09-17 23:25:54 +00:00
Mark Salyzyn
894af268de logd: settings: ro.config.low_ram support 
- limit settings to 64K, 256K and 1M if ro.config.low_ram true
- Correctly handle ro.logd.size

Bug: 17526187
Change-Id: I2380b649516b29c2a98f54de18e5a4780b3421ce
 2014-09-17 22:26:16 +00:00