PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,026 Commits 1 Branch 0 Tags
e692ec6a12e82fe11af7f7956089265a6090699c
Commit Graph

16026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
ba89f50ae7 am 80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev 
* commit '80cd373263cf5fef41ad6a99317ecdcd68594734':
  Reset Settings task when using the user switcher
 2014-09-08 09:14:52 +00:00
Alexandra Gherghina
70ad4ffd05 am dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev 
* commit 'dc3193ca6364ac9215180d2adb02f5ab009abe00':
  Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
 2014-09-08 09:14:51 +00:00
Jim Miller
e1877a1946 am 1f389c19: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev 
* commit '1f389c1996d754142c52c947105af4ec2db84f5c':
  Fix problem where rotating the device doesn't launch TrustAgent pref
 2014-09-08 09:14:25 +00:00
Alexandra Gherghina
74c489c94a am 80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev 
* commit '80cd373263cf5fef41ad6a99317ecdcd68594734':
  Reset Settings task when using the user switcher
 2014-09-08 09:14:24 +00:00
Alexandra Gherghina
ef0c08842f am dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev 
* commit 'dc3193ca6364ac9215180d2adb02f5ab009abe00':
  Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
 2014-09-08 09:14:23 +00:00
Jim Miller
1f389c1996 Merge "Fix problem where rotating the device doesn't launch TrustAgent pref" into lmp-dev 2014-09-08 08:26:14 +00:00
Alexandra Gherghina
80cd373263 Merge "Reset Settings task when using the user switcher" into lmp-dev 2014-09-08 08:04:44 +00:00
Alexandra Gherghina
dc3193ca63 Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev 2014-09-08 08:03:40 +00:00
vandwalle
b6854480d4 prettify the wifi verbose logging string 
Bug:15168065

Change-Id: I1a3bd38ea6562b7b48c70db8fbd6940d4c96ceb4
 2014-09-07 22:03:19 -07:00
Carlos Valdivia
f5d3e74ecc SECURITY: Don't pass a usable Pending Intent to 3rd parties. 
Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends.  This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.

Bug: 17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
 2014-09-07 17:45:58 -07:00
Amith Yamasani
34151f3c59 am e1076456: am 30c50b15: Use correct API for badging 
* commit 'e1076456eaebe6047818e424503ad86c3b125f66':
  Use correct API for badging
 2014-09-07 23:09:29 +00:00
Amith Yamasani
45308ef25d am 30c50b15: Use correct API for badging 
* commit '30c50b15d0d716567c71d590aa835dc4a27591d6':
  Use correct API for badging
 2014-09-07 23:05:42 +00:00
Amith Yamasani
e1076456ea am 30c50b15: Use correct API for badging 
* commit '30c50b15d0d716567c71d590aa835dc4a27591d6':
  Use correct API for badging
 2014-09-07 23:04:24 +00:00
Amith Yamasani
30c50b15d0 Use correct API for badging 
Bug: 17414778
Change-Id: Ieb9890751c3071088b9f5aab48053e767f78bfe5
 2014-09-07 15:38:09 -07:00
Jim Miller
250b9bee68 Fix problem where rotating the device doesn't launch TrustAgent pref 
This fixes a bug where the TrustAgent intent was being lost when
the device configurtion changes. It used to depend on a view that
gets recreated.  Instead, we persist the actual launch intent
which works across activity restarts.

Fixes bug 17040470

Change-Id: Ia1c93867254cfdc27683a767cf41fe74dbb97db0
 2014-09-07 14:30:38 -07:00
Fabrice Di Meglio
f5d7fe182f am 164d5ba7: am b5cc0134: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev 
* commit '164d5ba7babcc61e5e1219d50378db64bf09d80a':
  Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard
 2014-09-05 21:58:01 +00:00
PauloftheWest
8c138ea357 am 205a812a: am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev 
* commit '205a812ae300fd2566b6e62d9987f82ed39919dc':
  Material design updates for Bluetooth Settings dialog.
 2014-09-05 21:57:28 +00:00
Fabrice Di Meglio
164d5ba7ba am b5cc0134: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev 
* commit 'b5cc01342ea3930ae3bc7592e13c4b5f6f4c646d':
  Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard
 2014-09-05 21:20:18 +00:00
Fabrice Di Meglio
17f556c708 am b5cc0134: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev 
* commit 'b5cc01342ea3930ae3bc7592e13c4b5f6f4c646d':
  Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard
 2014-09-05 21:20:03 +00:00
Fabrice Di Meglio
b5cc01342e Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev 2014-09-05 21:12:51 +00:00
Fabrice Di Meglio
92239ed799 Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard 
- remove any reference to the Switch and use the SwitchBar API instead
- set the initial state of the SwitchBar depending on the WifiManager

Change-Id: I556bf8a007892c057edf7c6c144f71b2dcfe4f99
 2014-09-05 14:08:58 -07:00
PauloftheWest
5437b488cb am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev 
* commit 'c7fafa25c20bfdebe765227bbc135b4b4ec89be3':
  Material design updates for Bluetooth Settings dialog.
 2014-09-05 21:01:09 +00:00
PauloftheWest
205a812ae3 am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev 
* commit 'c7fafa25c20bfdebe765227bbc135b4b4ec89be3':
  Material design updates for Bluetooth Settings dialog.
 2014-09-05 21:00:57 +00:00
PauloftheWest
c7fafa25c2 Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev 2014-09-05 20:48:56 +00:00
Barnaby James
660bc7444f am 96bfc861: am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev 
* commit '96bfc86185fe14a52f676d0d0e90dffc61f0f52d':
  Remove intent filter for Airplane mode voice activity.
 2014-09-05 20:21:48 +00:00
Amith Yamasani
940e177dd1 am 2412af97: am 91648629: Merge "Follow API change for method name" into lmp-dev 
* commit '2412af973b071a7fa363b3f55f73f64a480d2662':
  Follow API change for method name
 2014-09-05 20:21:14 +00:00
Barnaby James
1299446dee am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev 
* commit '3c6f7a33398ab610ec1c734360be092db090fb50':
  Remove intent filter for Airplane mode voice activity.
 2014-09-05 20:09:24 +00:00
Barnaby James
96bfc86185 am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev 
* commit '3c6f7a33398ab610ec1c734360be092db090fb50':
  Remove intent filter for Airplane mode voice activity.
 2014-09-05 20:09:11 +00:00
Barnaby James
3c6f7a3339 Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev 2014-09-05 19:59:21 +00:00
Amith Yamasani
2412af973b am 91648629: Merge "Follow API change for method name" into lmp-dev 
* commit '9164862936dc439045d35670909385defb281395':
  Follow API change for method name
 2014-09-05 19:53:43 +00:00
Amith Yamasani
ba790ca3ac am 91648629: Merge "Follow API change for method name" into lmp-dev 
* commit '9164862936dc439045d35670909385defb281395':
  Follow API change for method name
 2014-09-05 19:53:27 +00:00
Amith Yamasani
9164862936 Merge "Follow API change for method name" into lmp-dev 2014-09-05 19:44:22 +00:00
PauloftheWest
8677d04512 Material design updates for Bluetooth Settings dialog. 
Bug: 17140512
Change-Id: I93dd89c3f12d8abe2041dd68faef8daf981252fb
 2014-09-05 10:29:17 -07:00
Svetoslav
f5c7e7290c am f7327201: am fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev 
* commit 'f73272017eedd328143c2d573b1bf9566da587a2':
  Fix an occasional crash in print job state fragment in Settings.
 2014-09-05 17:24:19 +00:00
Svetoslav
f9f16dfa0a am a7621f71: am 527ecccc: Merge "Update Settings due to API changes." into lmp-dev 
* commit 'a7621f7126c46021af701e08ebdba7318b723413':
  Update Settings due to API changes.
 2014-09-05 17:24:18 +00:00
Amith Yamasani
375baea456 Follow API change for method name 
Bug: 17389920
Change-Id: I5c5bdacd863f84c503e7a16dc611feda36bc462f
 2014-09-05 10:23:04 -07:00
Svetoslav
9b8912dbee am fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev 
* commit 'fd3a3d79290799ec80c3bc9cfe965280428a8077':
  Fix an occasional crash in print job state fragment in Settings.
 2014-09-05 17:17:51 +00:00
Svetoslav
3c0385e465 am 527ecccc: Merge "Update Settings due to API changes." into lmp-dev 
* commit '527ecccce879471dd0096b72a4be584d35fe32d0':
  Update Settings due to API changes.
 2014-09-05 17:17:50 +00:00
Svetoslav
f73272017e am fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev 
* commit 'fd3a3d79290799ec80c3bc9cfe965280428a8077':
  Fix an occasional crash in print job state fragment in Settings.
 2014-09-05 17:17:47 +00:00
Svetoslav
a7621f7126 am 527ecccc: Merge "Update Settings due to API changes." into lmp-dev 
* commit '527ecccce879471dd0096b72a4be584d35fe32d0':
  Update Settings due to API changes.
 2014-09-05 17:17:46 +00:00
Svetoslav
fd3a3d7929 Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev 2014-09-05 17:10:06 +00:00
Svetoslav
527ecccce8 Merge "Update Settings due to API changes." into lmp-dev 2014-09-05 17:09:15 +00:00
Jorim Jaggi
9a8887e0a1 am c4dbac06: am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev 
* commit 'c4dbac0613f13f9635ff910957b3af81ac2406c9':
  Remove weird divider from confirm_lock_pattern
 2014-09-05 17:08:53 +00:00
Alexandra Gherghina
9bcf252522 am 3b17ac20: am 51712241: Fix typo in intent filter 
* commit '3b17ac2007de8dbad2317f53ccea1e6677162e43':
  Fix typo in intent filter
 2014-09-05 17:08:17 +00:00
Jorim Jaggi
60b7e88289 am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev 
* commit 'f7cdbc3a68fc5a900b3d2f2d910b2990410737db':
  Remove weird divider from confirm_lock_pattern
 2014-09-05 16:15:01 +00:00
Jorim Jaggi
c4dbac0613 am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev 
* commit 'f7cdbc3a68fc5a900b3d2f2d910b2990410737db':
  Remove weird divider from confirm_lock_pattern
 2014-09-05 16:14:45 +00:00
Jorim Jaggi
f7cdbc3a68 Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev 2014-09-05 16:06:26 +00:00
Jorim Jaggi
d3a2ec0cbb Remove weird divider from confirm_lock_pattern 
Bug: 16686614
Change-Id: I5b62a220181e384328a3b27e05a218a5984e23d1
 2014-09-05 17:56:17 +02:00
Alexandra Gherghina
da1e8c75fb am 51712241: Fix typo in intent filter 
* commit '51712241f50f95d9bf8e83428ce5428f7f476431':
  Fix typo in intent filter
 2014-09-05 15:54:03 +00:00
Alexandra Gherghina
3b17ac2007 am 51712241: Fix typo in intent filter 
* commit '51712241f50f95d9bf8e83428ce5428f7f476431':
  Fix typo in intent filter
 2014-09-05 15:53:32 +00:00