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

16252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
2f696300b9 am ebd410e5: am 38a8fa2e: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev 
* commit 'ebd410e529c8dc249ce80bab86e178fe4de8fe27':
  Always use the LocalePicker's preferred locale names.
 2014-09-09 22:21:49 +00:00
Elliott Hughes
ebd410e529 am 38a8fa2e: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev 
* commit '38a8fa2e48b79c881f876af8640608cfdc648363':
  Always use the LocalePicker's preferred locale names.
 2014-09-09 22:09:19 +00:00
Jorim Jaggi
46bd010464 am b0ee68d5: am 5c202a51: am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev 
* commit 'b0ee68d5dad943000168fa9eb5910d69af737168':
  Fix layout issues with landscape pattern/password layouts
 2014-09-09 22:07:23 +00:00
PauloftheWest
9a1626c1f0 am a6b9eaaf: am a547bb99: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev 
* commit 'a6b9eaafbb88d556b8cdcbb5ad10dc8b83b3a0f4':
  Fixed a Null Pointer Error in Bluetooth Settings.
 2014-09-09 22:07:22 +00:00
Amith Yamasani
87c5261558 am 942102ef: am e7f89b6b: am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev 
* commit '942102efd3f9208ee2c3df16d0dd089201dedbf1':
  Handle disallowed NFC beam restriction
 2014-09-09 22:07:19 +00:00
Adam Lesinski
e42add8915 am 2554ccc9: am caf1be66: am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev 
* commit '2554ccc9e2e64d59ae4589a9740185d13e4b7087':
  Make UsageAccess WarningDialog actually instatiatable.
 2014-09-09 22:07:18 +00:00
Jorim Jaggi
b0ee68d5da am 5c202a51: am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev 
* commit '5c202a51b9598a7a1bd302a5b2d04dd751a72b3c':
  Fix layout issues with landscape pattern/password layouts
 2014-09-09 21:57:01 +00:00
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
Elliott Hughes
38a8fa2e48 am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev 
* commit 'a6e57b88ffa2af3014a3f689e3d08c7b77c9a64d':
  Always use the LocalePicker's preferred locale names.
 2014-09-09 21:56:01 +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
Elliott Hughes
a6e57b88ff Merge "Always use the LocalePicker's preferred locale names." into lmp-dev 2014-09-09 21:49:39 +00:00
Elliott Hughes
81395c8f3d Always use the LocalePicker's preferred locale names. 
Without this change we have the odd situation where LocalePicker goes out of
its way to avoid saying certain things but then -- as long as there's more than
one locale for a given language -- Settings would happily report the name we'd
been avoiding. (Either because it's too specific or because it's too sensitive.)

Also remove the unused bit-rotted duplicate of the blacklist; even if we needed
to access that list directly, we should use LocalePicker's copy.

Bug: 17150708
Change-Id: I9bfa0bf9a82bebd29ba45f4cbeaabb4e78570779
 2014-09-09 14:33:11 -07:00
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
c642601f54 am 5edbe31d: am 17437a64: am 29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev 
* commit '5edbe31db5ba1949acca7f593e05727edcd0267b':
  Removed connect button from Saved Networks dialog.
 2014-09-09 18:31:18 +00: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
a82605dc42 am 0ed54bff: am 7413c1fa: am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit '0ed54bffede9f7e2b9cd98c2425cd8d2c68978bd':
  Update Trusted Credentials screen in settings
 2014-09-09 15:03:52 +00: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
fa13725d12 am 8a71e343: am 15a2e89a: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev 
* commit '8a71e3436f4230551c0839cb7eeba44478d04dc2':
  Start cleaning up percentage formatting in Settings.
 2014-09-09 00:00:01 +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
6eccc85e94 am 36dbcdea: am 8e476892: am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev 
* commit '36dbcdeaf6b94f50de6333c2e509d5a63ba52a65':
  Fixed scrolling on the Wi-Fi Settings Dialog.
 2014-09-08 23:10:51 +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
c509c76068 am abc0e4b8: am ab3f2f6e: am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev 
* commit 'abc0e4b87261e34df9e69d2f543ce0a8e930efef':
  Disabled SIM Cards in Settings.
 2014-09-08 22:35:31 +00:00
PauloftheWest
23f77701be am 640a429d: am c6e1cc20: am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev 
* commit '640a429d513fb6c7b342c9166a911e02727b744d':
  Material theme updates for Wifi Dialog.
 2014-09-08 22:35:26 +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