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

15895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
7670de127c am 7c99c227: am 75235a29: am a14e3f33: Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev 
* commit '7c99c2278e9415e70a258ced14f8f8170827cec6':
  Removed the Wi-Fi icon shown when Wi-Fi is off.
 2014-08-27 22:06:15 +00:00
PauloftheWest
41efe71fab am bac5a389: am 3d319d0b: Merge "Greyed out SIM activities if only one SIM is present." into lmp-dev 
* commit 'bac5a3892dd7e1999f8e33fe7b4e28e3f0530cd9':
  Greyed out SIM activities if only one SIM is present.
 2014-08-27 21:58:18 +00:00
PauloftheWest
7c99c2278e am 75235a29: am a14e3f33: Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev 
* commit '75235a2974b7cba932edee1719167c5c16fc44dc':
  Removed the Wi-Fi icon shown when Wi-Fi is off.
 2014-08-27 21:58:17 +00:00
PauloftheWest
e4d0662ec5 am 55d10678: am 81fafc51: am db99ad93: Merge "Bluetooth Device picker will now scan for devices." into lmp-dev 
* commit '55d106786a4e6a923dcbb3aa2926659abbd00e51':
  Bluetooth Device picker will now scan for devices.
 2014-08-27 21:50:09 +00:00
PauloftheWest
da75eae851 am 7926eb04: am caccf27e: am d0ec53e3: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev 
* commit '7926eb04d94077d25d08697ea0c60e72eee506ac':
  Applied Material Spec to Bluetooth pairing dialog.
 2014-08-27 21:50:03 +00:00
PauloftheWest
680f2fa97f am 0b618179: am fc4f23f0: am 6213ba0e: Merge "Changed VPN add icon to white." into lmp-dev 
* commit '0b618179acb56e64d205d0aada50dda31889657a':
  Changed VPN add icon to white.
 2014-08-27 21:50:02 +00:00
Paul West
1360514087 am cf2c55dd: am 49e2efc0: am ad280a9b: Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev 
* commit 'cf2c55dd1f0de8b5e91690ab3409fb4e553e8460':
  Revert "Tapping a connected Bluetooth device now presents its settings dialog."
 2014-08-27 21:50:01 +00:00
PauloftheWest
bac5a3892d am 3d319d0b: Merge "Greyed out SIM activities if only one SIM is present." into lmp-dev 
* commit '3d319d0b905199931831098e68aadbad67314ed1':
  Greyed out SIM activities if only one SIM is present.
 2014-08-27 21:48:51 +00:00
PauloftheWest
75235a2974 am a14e3f33: Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev 
* commit 'a14e3f3373170ae126531a21bd9a121e0d886e53':
  Removed the Wi-Fi icon shown when Wi-Fi is off.
 2014-08-27 21:48:47 +00:00
PauloftheWest
3d319d0b90 Merge "Greyed out SIM activities if only one SIM is present." into lmp-dev 2014-08-27 21:41:27 +00:00
PauloftheWest
a14e3f3373 Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev 2014-08-27 21:40:09 +00:00
PauloftheWest
55d106786a am 81fafc51: am db99ad93: Merge "Bluetooth Device picker will now scan for devices." into lmp-dev 
* commit '81fafc5143cf41764c7286b48824f50cc0d957fc':
  Bluetooth Device picker will now scan for devices.
 2014-08-27 21:36:58 +00:00
PauloftheWest
7926eb04d9 am caccf27e: am d0ec53e3: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev 
* commit 'caccf27e3446a0e7029b1860ae4a92ce4142f355':
  Applied Material Spec to Bluetooth pairing dialog.
 2014-08-27 21:36:37 +00:00
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
81fafc5143 am db99ad93: Merge "Bluetooth Device picker will now scan for devices." into lmp-dev 
* commit 'db99ad9349c16665e3ca6c62192fe560d35d4a68':
  Bluetooth Device picker will now scan for devices.
 2014-08-27 21:11:43 +00:00
PauloftheWest
db99ad9349 Merge "Bluetooth Device picker will now scan for devices." into lmp-dev 2014-08-27 21:01:47 +00:00
PauloftheWest
9432b926fe Bluetooth Device picker will now scan for devices. 
Bug: 17157824
Change-Id: Ifcf17f55e942dbf6cdbe2a2ee30c90ddbd9c4bd8
 2014-08-27 13:56:04 -07:00
PauloftheWest
caccf27e34 am d0ec53e3: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev 
* commit 'd0ec53e33360cfb5cf4c176920917ef109754f22':
  Applied Material Spec to Bluetooth pairing dialog.
 2014-08-27 20:42:57 +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
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