PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,448 Commits 1 Branch 0 Tags
0b618179acb56e64d205d0aada50dda31889657a
Commit Graph

15448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
0b618179ac am fc4f23f0: am 6213ba0e: Merge "Changed VPN add icon to white." into lmp-dev 
* commit 'fc4f23f0e7a9e871bac60d74e504a9696a0b038a':
  Changed VPN add icon to white.
 2014-08-27 21:36:36 +00:00
Paul West
cf2c55dd1f am 49e2efc0: am ad280a9b: Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev 
* commit '49e2efc0f74d5ff0a8ec942e5fb3f04bb5f6ab0e':
  Revert "Tapping a connected Bluetooth device now presents its settings dialog."
 2014-08-27 21:36:35 +00:00
PauloftheWest
fc4f23f0e7 am 6213ba0e: Merge "Changed VPN add icon to white." into lmp-dev 
* commit '6213ba0ea107eabb6c9053c843c2c675ac03cfa4':
  Changed VPN add icon to white.
 2014-08-27 20:42:56 +00:00
Paul West
49e2efc0f7 am ad280a9b: Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev 
* commit 'ad280a9b0952ee8563dac8ee199685ef2de37600':
  Revert "Tapping a connected Bluetooth device now presents its settings dialog."
 2014-08-27 20:42:55 +00:00
PauloftheWest
6213ba0ea1 Merge "Changed VPN add icon to white." into lmp-dev 2014-08-27 20:38:56 +00:00
Paul West
ad280a9b09 Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev 2014-08-27 20:33:30 +00:00
Paul West
c0963dd7c5 Revert "Tapping a connected Bluetooth device now presents its settings dialog." 
This reverts commit 893be9cc34.

Change-Id: Idefe6a1972ca1130a687632f74051e5b5a2e54e1
 2014-08-27 20:31:38 +00:00
PauloftheWest
5c6222e971 Changed VPN add icon to white. 
Bug: 17288198
Change-Id: I5d66f269583d1d4bdb3e68fe011721ae805317e1
 2014-08-27 12:54:50 -07:00
Jeff Davidson
c77d11d188 am d8094bf0: am ffb76318: Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev 
* commit 'd8094bf0679bf04a478e26b8199d5a90274a6b5a':
  Use NetworkScoreManager when disabling scoring.
 2014-08-27 19:01:17 +00:00
Jeff Davidson
d8094bf067 am ffb76318: Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev 
* commit 'ffb76318f997300d0374eea9ee9376d1818860a3':
  Use NetworkScoreManager when disabling scoring.
 2014-08-27 18:54:25 +00:00
Jeff Davidson
ffb76318f9 Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev 2014-08-27 18:47:11 +00:00
Jeff Davidson
eadeb11b1b Use NetworkScoreManager when disabling scoring. 
Otherwise previous scores will not be cleared and the SCORER_CHANGED
broadcast will not be sent.

Bug: 17299736
Change-Id: I57b0c44a7972d885cf084aacf74829cf7d391dae
 2014-08-27 11:20:09 -07:00
PauloftheWest
167363e863 am c27b47ef: am 18fbf724: Merge "Entering Bluetooth in Settings will always initiate a scan." into lmp-dev 
* commit 'c27b47ef609ec31bf44c2a8849d404d26190bb97':
  Entering Bluetooth in Settings will always initiate a scan.
 2014-08-27 17:39:00 +00:00
PauloftheWest
c27b47ef60 am 18fbf724: Merge "Entering Bluetooth in Settings will always initiate a scan." into lmp-dev 
* commit '18fbf724aac345418eba37c656b968f19acd15f7':
  Entering Bluetooth in Settings will always initiate a scan.
 2014-08-27 17:32:38 +00:00
Maurice Lam
ac90200235 am 34d81bdb: am cf3c9ba2: Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev 
* commit '34d81bdb06719928bf060f35ccc0447cd510ef74':
  [WifiSetup] Progress when wifi scanning
 2014-08-27 17:25:33 +00:00
PauloftheWest
18fbf724aa Merge "Entering Bluetooth in Settings will always initiate a scan." into lmp-dev 2014-08-27 17:24:41 +00:00
Maurice Lam
34d81bdb06 am cf3c9ba2: Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev 
* commit 'cf3c9ba291f21058d4c86b31d4368b29b10e1952':
  [WifiSetup] Progress when wifi scanning
 2014-08-27 17:11:35 +00:00
Maurice Lam
cf3c9ba291 Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev 2014-08-27 17:04:47 +00:00
Baligh Uddin
4cd344c72f am 1bed70f0: (-s ours) am 29b5ef28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '1bed70f0ea2ed3de38be656f5f6bcf7bf64377d9':
  Import translations. DO NOT MERGE
 2014-08-27 16:43:49 +00:00
Baligh Uddin
1bed70f0ea am 29b5ef28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '29b5ef288a77b70b006cd1d3e6cd5738a67d6092':
  Import translations. DO NOT MERGE
 2014-08-27 16:33:40 +00:00
Baligh Uddin
29b5ef288a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 16:23:20 +00:00
Baligh Uddin
a34ecf41b8 Import translations. DO NOT MERGE 
Change-Id: I8ac9cf419f62a3420117bcaaffe4dca023ee1c9d
Auto-generated-cl: translation import
 2014-08-26 20:49:33 -07:00
Sander Alewijnse
1f7c91d61f am fbda0b3a: am 320dc051: Merge "Add extra to home settings starting intent." into lmp-dev 
* commit 'fbda0b3a81fe35060bbcd9ec121af08d935c07e8':
  Add extra to home settings starting intent.
 2014-08-26 17:14:15 +00:00
Sander Alewijnse
fbda0b3a81 am 320dc051: Merge "Add extra to home settings starting intent." into lmp-dev 
* commit '320dc05125c0db44c1182c4f5568bef440f643c8':
  Add extra to home settings starting intent.
 2014-08-26 17:07:18 +00:00
Sander Alewijnse
320dc05125 Merge "Add extra to home settings starting intent." into lmp-dev 2014-08-26 16:59:24 +00:00
Alan Viverette
f6faa4d292 am ea7c8dcb: am c61aabfa: Merge "Update material colors" into lmp-dev 
* commit 'ea7c8dcbdaa7f32d6741125c6701a0a1824a0567':
  Update material colors
 2014-08-26 04:56:08 +00:00
Amith Yamasani
0f30cbed1a am 19bcfd6e: am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev 
* commit '19bcfd6e4380d63521daf74d5bf81a2f849ace40':
  Fix toggle button clickability in app restrictions
 2014-08-26 04:56:07 +00:00
Nancy Chen
791b4ad386 am 64e68657: am a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev 
* commit '64e686570c6f71bae6d2bec0c1b72f7732e48a7b':
  API Review PhoneManager -> TelecommManager. Rename methods (3/6)
 2014-08-26 04:55:35 +00:00
Paul Lawrence
64988f9a50 am ef0a4938: am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev 
* commit 'ef0a4938a01f4d553d7513df33fa097c56543b7e':
  Honor hide pattern on crypto screen
 2014-08-26 04:54:05 +00:00
Alan Viverette
ea7c8dcbda am c61aabfa: Merge "Update material colors" into lmp-dev 
* commit 'c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9':
  Update material colors
 2014-08-25 23:29:01 +00:00
Amith Yamasani
19bcfd6e43 am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev 
* commit 'e352845ecad452823bb2c3ba1b0eb1abf2e9a442':
  Fix toggle button clickability in app restrictions
 2014-08-25 23:29:00 +00:00
Alan Viverette
c61aabfa22 Merge "Update material colors" into lmp-dev 2014-08-25 23:18:34 +00:00
Amith Yamasani
e352845eca Merge "Fix toggle button clickability in app restrictions" into lmp-dev 2014-08-25 23:18:33 +00:00
Alan Viverette
4895df355a Update material colors 
BUG: 17212898
Change-Id: Idb1c391de3c1fb150f06c3cf744780be1404d2e5
 2014-08-25 16:05:50 -07:00
Nancy Chen
64e686570c am a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev 
* commit 'a1ca4ed14d12cd3daa8bb5db5527676ca78c1850':
  API Review PhoneManager -> TelecommManager. Rename methods (3/6)
 2014-08-25 22:47:23 +00:00
Nancy Chen
a1ca4ed14d Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev 2014-08-25 22:24:15 +00:00
Amith Yamasani
3391321e2f Fix toggle button clickability in app restrictions 
Also fix side padding

Bug: 17159406
Change-Id: Ic1d61d9a4a7ae6f3f7c451405a6e127791edbdaf
 2014-08-25 15:20:34 -07:00
Paul Lawrence
ef0a4938a0 am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev 
* commit 'ee2a85c7c8a91db3067d9908b4b04d329a40ba71':
  Honor hide pattern on crypto screen
 2014-08-25 22:09:41 +00:00
Paul Lawrence
ee2a85c7c8 Merge "Honor hide pattern on crypto screen" into lmp-dev 2014-08-25 21:59:27 +00:00
Maurice Lam
b6c414a6d2 [WifiSetup] Progress when wifi scanning 
Use a custom empty view to show the status while wifi is scanning
or off. Cannot use android.R.id.empty because in phone portrait
layout the illustration is the listview header, which will be hidden
if the list is empty and we use ListView.setEmptyView.

Bug: 17183006
Change-Id: Ie8598303f4e61f87e078008fb7a03918ba92c9ef
 2014-08-25 13:19:49 -07:00
PauloftheWest
687d3a589e am 87d8074a: am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 
* commit '87d8074a1480d10804ada3507c5536be362b77c1':
  Updated Tethering and portable hotspot to use switches.
 2014-08-25 17:04:47 +00:00
PauloftheWest
87d8074a14 am aa5c7565: Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 
* commit 'aa5c7565e42efdfa5ae5506a0a9dfd4f05461034':
  Updated Tethering and portable hotspot to use switches.
 2014-08-25 16:55:21 +00:00
Baligh Uddin
0a0a0966de am d9960178: (-s ours) am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd9960178fda7184223cbc56c5dc11128ab1124b0':
  Import translations. DO NOT MERGE
 2014-08-25 16:51:07 +00:00
PauloftheWest
aa5c7565e4 Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev 2014-08-25 16:44:25 +00:00
Baligh Uddin
d9960178fd am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'cef6b220d6bf5c6ad003d2d528ad4dea305adf60':
  Import translations. DO NOT MERGE
 2014-08-25 16:32:55 +00:00
Baligh Uddin
cef6b220d6 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-25 16:21:03 +00:00
PauloftheWest
79ad723525 am 1c649f7f: am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 
* commit '1c649f7f9b9d85861c57d4d898b5fbe0e989d8b3':
  Tapping a connected Bluetooth device now presents its settings dialog.
 2014-08-25 16:12:08 +00:00
PauloftheWest
1c649f7f9b am 7560e22d: Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 
* commit '7560e22d7602250172f6e6ca16fdea0063348d15':
  Tapping a connected Bluetooth device now presents its settings dialog.
 2014-08-25 15:58:29 +00:00
PauloftheWest
7560e22d76 Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev 2014-08-25 15:48:16 +00:00
PauloftheWest
656c88cb71 Updated Tethering and portable hotspot to use switches. 
Bug: 17020102
Change-Id: I5da1745d4ea9545f8960c015ca6858fb0a34de0d
 2014-08-25 08:45:05 -07:00