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

15779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
a6b9eaafbb am a547bb99: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev 
* commit 'a547bb9940e38c6dd60eb998f17a17c26e350bbf':
  Fixed a Null Pointer Error in Bluetooth Settings.
 2014-09-09 21:56:23 +00:00
Amith Yamasani
942102efd3 am e7f89b6b: am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev 
* commit 'e7f89b6bfc5d3aeaa6ce1d330e5d7872ed87168d':
  Handle disallowed NFC beam restriction
 2014-09-09 21:55:55 +00:00
Adam Lesinski
2554ccc9e2 am caf1be66: am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev 
* commit 'caf1be66d1676df9796274f8eaed4c334774f15e':
  Make UsageAccess WarningDialog actually instatiatable.
 2014-09-09 21:55:54 +00: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
5edbe31db5 am 17437a64: am 29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev 
* commit '17437a64d746358cc27d058d119801ea328a1a3f':
  Removed connect button from Saved Networks dialog.
 2014-09-09 18:19:50 +00: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
0ed54bffed am 7413c1fa: am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit '7413c1fae4679700ef362fbdaa91ae332953b8d1':
  Update Trusted Credentials screen in settings
 2014-09-09 11:17:50 +00: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
8a71e3436f am 15a2e89a: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev 
* commit '15a2e89aa8646b0e080ed22ef6dab6bbdfc8f94a':
  Start cleaning up percentage formatting in Settings.
 2014-09-08 23:50:48 +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
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