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

15380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
5c202a51b9 am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev 
* commit 'b2bea36bb51af63a5e65cedbf49c3ccdd5a7507c':
  Fix layout issues with landscape pattern/password layouts
 2014-09-09 21:29:14 +00:00
Jorim Jaggi
b2bea36bb5 Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev 2014-09-09 21:18:39 +00:00
Jorim Jaggi
8de05c57b5 Fix layout issues with landscape pattern/password layouts 
Bug: 17416448
Change-Id: I12067846b05659dc7b56fe61f872a4ba85941604
 2014-09-09 23:11:58 +02:00
PauloftheWest
a547bb9940 am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev 
* commit '654517a510dd4f655a468ad0083d04929338a7df':
  Fixed a Null Pointer Error in Bluetooth Settings.
 2014-09-09 20:51:57 +00:00
PauloftheWest
654517a510 Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev 2014-09-09 20:45:59 +00:00
Amith Yamasani
e7f89b6bfc am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev 
* commit '6707999600129286ad362bfc2974e321ff06ec90':
  Handle disallowed NFC beam restriction
 2014-09-09 20:35:48 +00:00
Adam Lesinski
caf1be66d1 am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev 
* commit '3649045d109090f8e5951414179fa87dd68ed519':
  Make UsageAccess WarningDialog actually instatiatable.
 2014-09-09 20:35:47 +00:00
Amith Yamasani
6707999600 Merge "Handle disallowed NFC beam restriction" into lmp-dev 2014-09-09 20:30:36 +00:00
Adam Lesinski
3649045d10 Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev 2014-09-09 20:30:11 +00:00
Amith Yamasani
25a1e95ed6 Handle disallowed NFC beam restriction 
Don't enable the beam setting and toggle if it is disallowed for
the current user.

Bug: 17387303
Change-Id: Ifdfe049bef281454c978a37acb49c59758344ae6
 2014-09-09 12:07:11 -07:00
Adam Lesinski
21dfa201f8 Make UsageAccess WarningDialog actually instatiatable. 
The DialogFragment used for WarningDialog was not instatiatable
by the fragment manager.

Bug:17435234
Change-Id: I5f65dd1e0ec0b95d048934480bd5fafd8648ab7c
 2014-09-09 11:34:55 -07:00
PauloftheWest
17437a64d7 am 29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev 
* commit '29a9c6844b04415505a9a3e9212f85432492702e':
  Removed connect button from Saved Networks dialog.
 2014-09-09 18:09:00 +00:00
PauloftheWest
29a9c6844b Merge "Removed connect button from Saved Networks dialog." into lmp-dev 2014-09-09 18:00:49 +00:00
PauloftheWest
c009b8a496 Fixed a Null Pointer Error in Bluetooth Settings. 
+ The root of the problem is that the callback for a device change may be
set before the fragment has a layout.  Then if a change does come in,
getView() would return null.  This fix delays registering the callback
until appropiate.

Bug: 17404518
Change-Id: Ibd0e90f82593d45729f427bcc2e40fe9195eb42a
 2014-09-09 10:12:00 -07:00
Zoltan Szatmary-Ban
7413c1fae4 am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit '574db4269528c7277f6e14a44156909fdb063190':
  Update Trusted Credentials screen in settings
 2014-09-09 11:12:09 +00:00
Zoltan Szatmary-Ban
574db42695 Merge "Update Trusted Credentials screen in settings" into lmp-dev 2014-09-09 11:05:54 +00:00
Elliott Hughes
15a2e89aa8 am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev 
* commit '5c0d0729b1701428d46ee7abb31f2a83d8da38ab':
  Start cleaning up percentage formatting in Settings.
 2014-09-08 23:39:56 +00:00
Elliott Hughes
5c0d0729b1 Merge "Start cleaning up percentage formatting in Settings." into lmp-dev 2014-09-08 23:26:20 +00:00
PauloftheWest
a7383f3862 Removed connect button from Saved Networks dialog. 
Bug: 17065357
Change-Id: Idb46ac404b171733ccac271ba74188224ca2611d
 2014-09-08 16:06:04 -07: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
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
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
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
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
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
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
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