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

16192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
60f85d7ec7 am f3ff3330: am 327b99e7: am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev 
* commit 'f3ff33307b93a0ec31dce8d177205672bd4ad979':
  Turning Bluetooth on will make the device discoverable.
 2014-09-08 21:27:50 +00:00
PauloftheWest
f3ff33307b am 327b99e7: am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev 
* commit '327b99e74c24f4f2cafb5a618c6f7363f469b3fd':
  Turning Bluetooth on will make the device discoverable.
 2014-09-08 21:17:02 +00:00
PauloftheWest
327b99e74c am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev 
* commit '5fe30ea841d0512c414059c814a0d1e0590b7eeb':
  Turning Bluetooth on will make the device discoverable.
 2014-09-08 21:06:27 +00:00
PauloftheWest
5fe30ea841 Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev 2014-09-08 21:00:11 +00:00
PauloftheWest
469c812878 Turning Bluetooth on will make the device discoverable. 
Bug: 17368189
Change-Id: Ic526fb1ff9dcc15e6fe1db055a471cc570b6a2e1
 2014-09-08 13:31:53 -07:00
Alan Viverette
a760eba5df am fea2e6a0: am def61529: am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev 
* commit 'fea2e6a0cd932d16ea030d5b526e8c2141d11fa3':
  Use correct list index for search highlighting
 2014-09-08 20:14:57 +00:00
Alan Viverette
fea2e6a0cd am def61529: am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev 
* commit 'def6152913ef554ca0606135bcde90d1685f92c6':
  Use correct list index for search highlighting
 2014-09-08 20:05:12 +00:00
Alan Viverette
def6152913 am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev 
* commit '01f3a15e89f80d88ba8600a53f5722468fecd4c9':
  Use correct list index for search highlighting
 2014-09-08 19:57:07 +00:00
vandwalle
1603ff70c8 am 2aeb4c2d: am 2e3d6d38: am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev 
* commit '2aeb4c2dfb5dc1b98a725362923adf0209085868':
  prettify the wifi verbose logging string
 2014-09-08 19:51:23 +00:00
Alan Viverette
01f3a15e89 Merge "Use correct list index for search highlighting" into lmp-dev 2014-09-08 19:47:54 +00:00
vandwalle
2aeb4c2dfb am 2e3d6d38: am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev 
* commit '2e3d6d38548d54d7936b4ad9362468707f8d5d89':
  prettify the wifi verbose logging string
 2014-09-08 19:45:16 +00:00
Alan Viverette
2fed4d4256 Use correct list index for search highlighting 
BUG: 14974443
Change-Id: Iad3d3efb2449fc61636c221bde92169293bf5356
 2014-09-08 12:40:59 -07:00
Alexandra Gherghina
2eaa925167 am 4ac6247c: am 572290d6: am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev 
* commit '4ac6247c56514d76351e7ae7b2661507e8d01970':
  Splits out ACTION_MAIN intent filter for Settings and doesn't forward it.
 2014-09-08 19:38:06 +00:00
vandwalle
2e3d6d3854 am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev 
* commit 'c187193c19cb8ad617ae85b81cb19a4d7d8fe16a':
  prettify the wifi verbose logging string
 2014-09-08 19:32:32 +00:00
Alexandra Gherghina
4ac6247c56 am 572290d6: am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev 
* commit '572290d68b8a9c05b8337b7e1975534f8192e428':
  Splits out ACTION_MAIN intent filter for Settings and doesn't forward it.
 2014-09-08 19:31:58 +00:00
vandwalle
c187193c19 Merge "prettify the wifi verbose logging string" into lmp-dev 2014-09-08 19:22:40 +00:00
Alexandra Gherghina
572290d68b am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev 
* commit 'edbfedf58fe2cb636017cc6d16da654525a4362f':
  Splits out ACTION_MAIN intent filter for Settings and doesn't forward it.
 2014-09-08 19:21:39 +00:00
Alexandra Gherghina
edbfedf58f Merge "Splits out ACTION_MAIN intent filter for Settings and doesn't forward it." into lmp-dev 2014-09-08 19:13:10 +00:00
Carlos Valdivia
92a182acca am c383a2a4: am 70a2b5d9: am 690ce1b3: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev 
* commit 'c383a2a4a2961e1441e81ea745ce09fe08c130ab':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
 2014-09-08 18:52:43 +00:00
Carlos Valdivia
c383a2a4a2 am 70a2b5d9: am 690ce1b3: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev 
* commit '70a2b5d93bc75a115f8c2f4fd847ef8b3a9bbe42':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
 2014-09-08 18:44:42 +00:00
Carlos Valdivia
70a2b5d93b am 690ce1b3: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev 
* commit '690ce1b32546c899fcf07f9d6552b04bb6fb7b2e':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
 2014-09-08 18:29:25 +00:00
Carlos Valdivia
690ce1b325 Merge "SECURITY: Don't pass a usable Pending Intent to 3rd parties." into lmp-dev 2014-09-08 18:21:03 +00:00
Jim Miller
db11c71cdb am 6adc2cec: am e1877a19: am 1f389c19: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev 
* commit '6adc2cecb52e9ae2eace821baf8bc5c81592c707':
  Fix problem where rotating the device doesn't launch TrustAgent pref
 2014-09-08 09:30:07 +00:00
Alexandra Gherghina
e7daaa0276 am 96fdef53: am 74c489c9: am 80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev 
* commit '96fdef53b5d674854250c1df05bc4a374ccd4a60':
  Reset Settings task when using the user switcher
 2014-09-08 09:30:06 +00:00
Alexandra Gherghina
7ef212dffb am b7992ade: am ef0c0884: am dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev 
* commit 'b7992ade66c6de0436127e4641d60a7c561502de':
  Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
 2014-09-08 09:30:05 +00:00
Jim Miller
6adc2cecb5 am e1877a19: am 1f389c19: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev 
* commit 'e1877a19463535cf147196451fb811f8bb9ea380':
  Fix problem where rotating the device doesn't launch TrustAgent pref
 2014-09-08 09:20:23 +00:00
Alexandra Gherghina
96fdef53b5 am 74c489c9: am 80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev 
* commit '74c489c94ae58033c2e9d58c68fb7312f441c3fd':
  Reset Settings task when using the user switcher
 2014-09-08 09:20:22 +00:00
Alexandra Gherghina
b7992ade66 am ef0c0884: am dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev 
* commit 'ef0c08842f5a3fbbba0a889cb1ee820f8f63f6aa':
  Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
 2014-09-08 09:20:21 +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
f0afdd5919 am 34151f3c: am e1076456: am 30c50b15: Use correct API for badging 
* commit '34151f3c591d4948fd8e6d3e0672d0221897c2c9':
  Use correct API for badging
 2014-09-07 23:14:41 +00: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
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
5965cf208a am f5d7fe18: am 164d5ba7: am b5cc0134: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev 
* commit 'f5d7fe182f1461dfd5629ffd2e6232ebc5d7a708':
  Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard
 2014-09-05 22:09:36 +00:00
PauloftheWest
233fae437d am 8c138ea3: am 205a812a: am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev 
* commit '8c138ea357210fa22504367f9d7b8043d13cfa6b':
  Material design updates for Bluetooth Settings dialog.
 2014-09-05 22:09:31 +00: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
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
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