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

15909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
36dbcdeaf6 am 8e476892: am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev 
* commit '8e476892937b5661a38f9c551e39c5dbe6444ab4':
  Fixed scrolling on the Wi-Fi Settings Dialog.
 2014-09-08 22:57:27 +00:00
PauloftheWest
8e47689293 am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev 
* commit 'bec89d797b6f2680c544639faed7e47573625e11':
  Fixed scrolling on the Wi-Fi Settings Dialog.
 2014-09-08 22:51:29 +00:00
PauloftheWest
bec89d797b Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev 2014-09-08 22:34:51 +00:00
PauloftheWest
abc0e4b872 am ab3f2f6e: am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev 
* commit 'ab3f2f6e4de972442c48a6cc1283c428116c769a':
  Disabled SIM Cards in Settings.
 2014-09-08 22:22:16 +00:00
PauloftheWest
640a429d51 am c6e1cc20: am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev 
* commit 'c6e1cc20d89ffb60732288a30dc2e91fff605463':
  Material theme updates for Wifi Dialog.
 2014-09-08 22:22:15 +00:00
PauloftheWest
ab3f2f6e4d am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev 
* commit 'e5f847357697f15fe0507b9c9a77e85f2c0aeedf':
  Disabled SIM Cards in Settings.
 2014-09-08 22:12:36 +00:00
PauloftheWest
c6e1cc20d8 am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev 
* commit 'd0db988bb635975a366654099fe1ac559283161f':
  Material theme updates for Wifi Dialog.
 2014-09-08 22:12:35 +00:00
PauloftheWest
e5f8473576 Merge "Disabled SIM Cards in Settings." into lmp-dev 2014-09-08 22:02:11 +00:00
PauloftheWest
d0db988bb6 Merge "Material theme updates for Wifi Dialog." into lmp-dev 2014-09-08 22:01:06 +00:00
PauloftheWest
7ac5a1e887 Fixed scrolling on the Wi-Fi Settings Dialog. 
+ When needed, scrollbars will always appear on the Wi-Fi Settings Dialog.

Bug: 17166502
Change-Id: I7f61746b505d1a1476e987571dc757d01ce636df
 2014-09-08 14:59:04 -07:00
PauloftheWest
96fef981ed Material theme updates for Wifi Dialog. 
Bug: 17014192
Change-Id: I1e5dd04199a433d8d1c5c4e4c48329e871e28db5
 2014-09-08 14:43:45 -07:00
Andres Morales
37df3745b4 am 68ccc9f9: am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev 
* commit '68ccc9f96cc5d07538f0201b93bf34d464a919df':
  Fix issue where can't FR Volantis if OEM unlock is enabled
 2014-09-08 21:27:36 +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
9998f473ca Disabled SIM Cards in Settings. 
+ Multi-SIM has been punted out from the L release. This change disables
the SIM Cards UI while keeping the code base.

Bug: 16808006
Change-Id: I2bd7ad430a6309f3f2241cd26ec86268aa31b699
 2014-09-08 14:16:30 -07:00
Andres Morales
68ccc9f96c am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev 
* commit '4fc50daefa205c6a511459c2978c288df31dd505':
  Fix issue where can't FR Volantis if OEM unlock is enabled
 2014-09-08 21:16:28 +00:00
Andres Morales
4fc50daefa Merge "Fix issue where can't FR Volantis if OEM unlock is enabled" into lmp-dev 2014-09-08 21:07:48 +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
Andres Morales
e6bf2a5609 Fix issue where can't FR Volantis if OEM unlock is enabled 
Bug: 17426800
Change-Id: I02340d1ec4b80d9e3b05d35d36653c6ff4ff3232
 2014-09-08 13:14:00 -07: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
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
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
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
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
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
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