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

15926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d0ec53e333 Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev 2014-08-27 20:40:38 +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
e49c30e533 Applied Material Spec to Bluetooth pairing dialog. 
Bug: 17018290
Change-Id: I621164245e6ad8213a689ea4919c619a9ee4f189
 2014-08-27 13:17:51 -07:00
PauloftheWest
5c6222e971 Changed VPN add icon to white. 
Bug: 17288198
Change-Id: I5d66f269583d1d4bdb3e68fe011721ae805317e1
 2014-08-27 12:54:50 -07:00
Jeff Davidson
9673bf137c am c77d11d1: am d8094bf0: am ffb76318: Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev 
* commit 'c77d11d188069848abaa960db4941f4e92f4e604':
  Use NetworkScoreManager when disabling scoring.
 2014-08-27 19:14:15 +00: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
ca7a9c6f1c am 167363e8: am c27b47ef: am 18fbf724: Merge "Entering Bluetooth in Settings will always initiate a scan." into lmp-dev 
* commit '167363e8632f2f7b2c2f03341dfed01f8444ef66':
  Entering Bluetooth in Settings will always initiate a scan.
 2014-08-27 17:51:39 +00: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
Maurice Lam
8c60d8002c am ac902002: am 34d81bdb: am cf3c9ba2: Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev 
* commit 'ac90200235dc51f18fff55f5b8a6a59a3b1e5e3b':
  [WifiSetup] Progress when wifi scanning
 2014-08-27 17:32:57 +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
Baligh Uddin
b1e48a531d am 4cd344c7: (-s ours) am 1bed70f0: (-s ours) am 29b5ef28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4cd344c72fcf2e97dc5e8b4598fc89f1178e4e09':
  Import translations. DO NOT MERGE
 2014-08-27 17:07:44 +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
c1fcd57eed Merge "Import translations. DO NOT MERGE" 2014-08-27 16:23:04 +00:00
Sander Alewijnse
fe4eff6a65 Disable auto time checkbox if date/time locked down by DO. 
Bug:16948504
Change-Id: I2a2b21684e17639233cd8c0dad7d3b44c4a2bd26
 2014-08-27 15:01:11 +01:00
Selim Cinek
4ce62f3fab Added colors to system notifications 
Bug: 17128331
Change-Id: I0cf0fe76a97d9dd772cd23475eddf5bdb92b2cca
 2014-08-27 13:09:44 +02:00
Baligh Uddin
5b025e75fb Import translations. DO NOT MERGE 
Change-Id: I390fa4d46d53d077b371b1f0cc2d880208aedb7f
Auto-generated-cl: translation import
 2014-08-26 21:00:49 -07: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
Chris Wren
c2b750ca5b Don't show nonesensical notification visibility value. 
lock_screen_notifications_summary_hide doesn't make sense on insecure
lock screens, so don't show it, but make sure we can restore it if the
user re-enables a secure method.

Bug: 16649523
Change-Id: Ie295cd59f5e527da8402748834576bab97e9ad89
 2014-08-26 17:33:56 -04:00
Sander Alewijnse
76683efa80 am 1f7c91d6: am fbda0b3a: am 320dc051: Merge "Add extra to home settings starting intent." into lmp-dev 
* commit '1f7c91d61fd4b1d4a9963baa305b9c4040dd7681':
  Add extra to home settings starting intent.
 2014-08-26 17:23:50 +00: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
1d439572ec am f6faa4d2: am ea7c8dcb: am c61aabfa: Merge "Update material colors" into lmp-dev 
* commit 'f6faa4d292186bd5927de59f96cfe7a2cb04156c':
  Update material colors
 2014-08-26 10:17:17 +00:00
Amith Yamasani
6ef47af07d am 0f30cbed: am 19bcfd6e: am e352845e: Merge "Fix toggle button clickability in app restrictions" into lmp-dev 
* commit '0f30cbed1a36c69b368869ec8178e6645973c9b3':
  Fix toggle button clickability in app restrictions
 2014-08-26 10:17:16 +00:00
Nancy Chen
cf4ef465fd am 791b4ad3: am 64e68657: am a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev 
* commit '791b4ad3869a9de4350bb4f61bdc590b946da988':
  API Review PhoneManager -> TelecommManager. Rename methods (3/6)
 2014-08-26 10:17:15 +00:00
Paul Lawrence
531ed5848b am 64988f9a: am ef0a4938: am ee2a85c7: Merge "Honor hide pattern on crypto screen" into lmp-dev 
* commit '64988f9a5022a3e0458416cc829fbdec267b5edd':
  Honor hide pattern on crypto screen
 2014-08-26 10:17:15 +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