PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,531 Commits 1 Branch 0 Tags
9f153fedd9059a7dba5f8d1120c68fc837cc6099
Commit Graph

17531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
310947bc00 am e8362a99: (-s ours) am 7c4b3c13: (-s ours) am 026cbba1: (-s ours) am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e8362a99cf0699ebe502f9d0522bad2c05ec901b':
  Import translations. DO NOT MERGE
 2014-09-19 23:40:56 +00:00
Baligh Uddin
2e2cfb4166 am e9f87a45: (-s ours) am a1960823: (-s ours) am 30032b95: (-s ours) am ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'e9f87a458b5a9e61501f60c5728f5c7a93a327cd':
  Import translations. DO NOT MERGE
 2014-09-19 23:31:05 +00:00
Svetoslav
352c666c55 am 90d5dc63: am 4b1a41c4: am d56668a7: am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit '90d5dc63105b3fe46682bb183f7bf99e36aa8e9b':
  Crash in Settings cancelling a print job from the job list.
 2014-09-19 23:30:04 +00:00
Baligh Uddin
e8362a99cf am 7c4b3c13: (-s ours) am 026cbba1: (-s ours) am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7c4b3c13330199f0494568b53e58a1f5669d54b4':
  Import translations. DO NOT MERGE
 2014-09-19 23:17:54 +00:00
Baligh Uddin
7c4b3c1333 am 026cbba1: (-s ours) am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '026cbba1f25bae341bd832edbebaa2c60e12c836':
  Import translations. DO NOT MERGE
 2014-09-19 23:09:08 +00:00
Baligh Uddin
e9f87a458b am a1960823: (-s ours) am 30032b95: (-s ours) am ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'a19608235dfb38e7d7bf53326a954d4f6a35aab2':
  Import translations. DO NOT MERGE
 2014-09-19 22:59:53 +00:00
Baligh Uddin
026cbba1f2 am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4e3f5709ad0892d3c8ffe6cbb620000ffe21f640':
  Import translations. DO NOT MERGE
 2014-09-19 22:56:52 +00:00
Baligh Uddin
a19608235d am 30032b95: (-s ours) am ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '30032b95d815312c1fdfc4c75b616c18385cd990':
  Import translations. DO NOT MERGE
 2014-09-19 22:49:37 +00:00
Baligh Uddin
4e3f5709ad am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f015d47cf526b2bc6061f8d10dd28b82df1da4ab':
  Import translations. DO NOT MERGE
 2014-09-19 22:46:30 +00:00
Baligh Uddin
30032b95d8 am ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ae7c180ad763d7b477c0e5ca5ec9d2c908f440cd':
  Import translations. DO NOT MERGE
 2014-09-19 22:44:01 +00:00
Baligh Uddin
f015d47cf5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-19 22:34:18 +00:00
Baligh Uddin
ae7c180ad7 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-19 22:34:16 +00:00
Baligh Uddin
4a06506beb Merge "Import translations. DO NOT MERGE" 2014-09-19 22:34:14 +00:00
Svetoslav
90d5dc6310 am 4b1a41c4: am d56668a7: am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit '4b1a41c4c657b704e65f7d515b91118feb109693':
  Crash in Settings cancelling a print job from the job list.
 2014-09-19 22:20:10 +00:00
Svetoslav
4b1a41c4c6 am d56668a7: am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit 'd56668a7d13227780005fcffdcdbd75810cf926f':
  Crash in Settings cancelling a print job from the job list.
 2014-09-19 22:11:02 +00:00
Svetoslav
d56668a7d1 am abcf0302: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit 'abcf0302e4351089322debf3739ac169ec299a5a':
  Crash in Settings cancelling a print job from the job list.
 2014-09-19 22:00:59 +00:00
Svetoslav
abcf0302e4 am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 
* commit '1154caa834d1fb502e9f80a509683faaf9b16a7f':
  Crash in Settings cancelling a print job from the job list.
 2014-09-19 21:49:18 +00:00
Svetoslav
1154caa834 Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev 2014-09-19 21:41:56 +00:00
Svetoslav
43835e006e Crash in Settings cancelling a print job from the job list. 
bug:17585582

Change-Id: I44aef7e09c26141388b410762e93164d8df9a0c6
 2014-09-19 14:15:52 -07:00
PauloftheWest
9bab4ea695 Fixed a Bluetooth discovery bug. 
+ Now when a user goes to Settings->Bluetooth and turns on Bluetooth,
the device will be discoverable.

Bug: 17368189
Change-Id: Ia0d8000ddf7e3c3b43172c08ee28e7305d205462
 2014-09-19 14:07:29 -07:00
Vinit Deshpande
30bb30dad0 am 579e970a: am cce30794: am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit '579e970a907fe0d99cdfe1f7cf9bd70343944df6':
  Fix automatic Wi-fi toggle
 2014-09-19 19:08:59 +00:00
Vinit Deshpande
579e970a90 am cce30794: am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit 'cce30794f06310c56024d80e45dcb5d8e7d4a4fa':
  Fix automatic Wi-fi toggle
 2014-09-19 18:58:46 +00:00
Vinit Deshpande
cce30794f0 am 50234a19: am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit '50234a19aa8d2a5b4b640bbe3cf4f6d735a8baee':
  Fix automatic Wi-fi toggle
 2014-09-19 18:49:14 +00:00
Vinit Deshpande
50234a19aa am 22592afd: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit '22592afdd5d35618ddd5f8662994d8c15cf43d3f':
  Fix automatic Wi-fi toggle
 2014-09-19 18:37:05 +00:00
Vinit Deshpande
22592afdd5 am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev 
* commit '9a8c58d49dd84a45f216349fd4cbc2dacfdac9fe':
  Fix automatic Wi-fi toggle
 2014-09-19 18:29:45 +00:00
Vinit Deshpande
9a8c58d49d Merge "Fix automatic Wi-fi toggle" into lmp-dev 2014-09-19 18:21:57 +00:00
PauloftheWest
a4b8fb36b4 Fixed Settings Cellular Networks crash. 
+ Removed the Cellular Networks option from Data Usage when the user is not
  the phone owner.

Bug: 17529931
Change-Id: Ice89b8fb1e6d41fe71235af0beaa1ee3653f8cf8
 2014-09-19 08:08:26 -07:00
Zoltan Szatmary-Ban
90ecb62348 am 073c9eb9: am dd320ec8: am 30b4aa9f: am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit '073c9eb9aba8ea39b853fcf116a28e4501075875':
  Show Power usage details for the correct user
 2014-09-19 13:40:42 +00:00
Zoltan Szatmary-Ban
073c9eb9ab am dd320ec8: am 30b4aa9f: am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit 'dd320ec86920d87a6bc38036ca3e9824272ffd2e':
  Show Power usage details for the correct user
 2014-09-19 13:26:57 +00:00
Zoltan Szatmary-Ban
dd320ec869 am 30b4aa9f: am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit '30b4aa9f27e36a729f37e0c3bb3e7ebf45f851d1':
  Show Power usage details for the correct user
 2014-09-19 11:00:19 +00:00
Zoltan Szatmary-Ban
30b4aa9f27 am 28277ee9: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit '28277ee9fa51cd039e83fd6a87fe60fefb07158a':
  Show Power usage details for the correct user
 2014-09-19 10:49:08 +00:00
Zoltan Szatmary-Ban
28277ee9fa am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev 
* commit '6e1d8277e6c6443ad286bf25a7decb4f5a9b0cdf':
  Show Power usage details for the correct user
 2014-09-19 10:38:17 +00:00
Zoltan Szatmary-Ban
6e1d8277e6 Merge "Show Power usage details for the correct user" into lmp-dev 2014-09-19 10:27:47 +00:00
Matthew Xie
d263271c5c am c0e25a1a: am 1d3a3fb5: am 3d76c268: am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit 'c0e25a1ad247d9f71163d15844f3bfa3d2c81418':
  Do not overwrite alias with device name
 2014-09-19 09:42:52 +00:00
Matthew Xie
c0e25a1ad2 am 1d3a3fb5: am 3d76c268: am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit '1d3a3fb52c76e2203e85bb2a5152846f209fae34':
  Do not overwrite alias with device name
 2014-09-19 09:28:57 +00:00
Matthew Xie
1d3a3fb52c am 3d76c268: am a93c4cae: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev 
* commit '3d76c26887bb0e8f74e76bf64801b6c291ce8847':
  Do not overwrite alias with device name
 2014-09-19 08:40:18 +00:00
PauloftheWest
c7c26a04e0 am 7612e0d7: am 21afc838: am 50a53bdb: am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev 
* commit '7612e0d7093c99bf3e3a4bdaa90302acbe66e906':
 2014-09-19 08:13:57 +00:00
Sander Alewijnse
8f2fe44c4d am 18d99cea: am fc10b1e8: am 09c1ddc5: am b997bd50: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '18d99ceab6df1d183b686c914ffcb30e550e2a70':
 2014-09-19 08:13:13 +00:00
Mark Salyzyn
611df59f19 am 218d4962: am b340d01e: am 9d690250: am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support 
* commit '218d49625bc2c9849f76f990c8e14873a84a8161':
 2014-09-19 08:10:16 +00:00
Amith Yamasani
bc2ad5e28d am e1d66664: am befe3c6f: am c7ab2db7: am 80a1ced5: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev 
* commit 'e1d66664520d5f0e48f6df128421cccb4d527004':
 2014-09-19 07:44:43 +00:00
John Spurlock
caea99bc5f am f1f11b5b: am 7cd016e3: am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev 
* commit 'f1f11b5b25ceed85f74c6d64e91a870bf7a1592c':
 2014-09-19 07:44:37 +00:00
PauloftheWest
301381b4f7 am f03f6ab3: am ed9fd0dd: am 01de9832: am b2737bc0: am 3cc81aea: Increase char limit for translation. 
* commit 'f03f6ab3762611ee22b1dbb3dc6bb81379d8ac7e':
 2014-09-19 07:43:56 +00:00
Maurice Lam
15268118df am 5130a2e4: am 670e1e5e: am ac115451: am 7fc505a1: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 
* commit '5130a2e4539e3fea3f13475cf92e94cd158fd0d5':
 2014-09-19 07:35:49 +00:00
Baligh Uddin
5653e2543d am 0bb9427b: (-s ours) am c6954436: (-s ours) am bbaad6b9: (-s ours) am 453053db: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '0bb9427b4a2fcb4af48067cb5e1161503fa28b16':
 2014-09-19 07:35:48 +00:00
PauloftheWest
c0865057de am 3244c683: am 2aed3a5e: am ebb04444: am 9e7073ae: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev 
* commit '3244c683a2d0c4e50919ea2e8cd2857729897b5c':
 2014-09-19 07:35:47 +00:00
Edward Jee
437a1ad0fb am 96d840fc: am 78189c64: am a17545fa: am c64a51cb: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth. 
* commit '96d840fc12d894ed6b2a96522e833e6ec7056dd6':
 2014-09-19 07:35:46 +00:00
Edward Jee
b6b99d8377 am 3c4f081f: am 69010fb1: am ea9c43ca: am 299faadb: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '3c4f081f590a5ff84a2820b013a5ee300dbfdc73':
 2014-09-19 07:35:45 +00:00
PauloftheWest
803a742f50 am b268fad4: am 3724edb3: am f4713e0f: am 99f7d73b: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit 'b268fad47e6a1bd625ccb3b1f76577beee258895':
 2014-09-19 07:35:44 +00:00
Dianne Hackborn
59637933b6 am cc9cacb5: am 4e2f9ca6: am 99b1261c: am 9e4b5269: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times. 
* commit 'cc9cacb5d480f532bfe003f9d8011cfbe2873267':
 2014-09-19 07:35:43 +00:00
Dianne Hackborn
5e91d3d67c am be46e2a4: am 5df5798e: am 6d9988e7: am ebcba9dc: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev 
* commit 'be46e2a4bd339e37bd4d6d31408d459ec87872b5':
 2014-09-19 07:35:42 +00:00