John Spurlock
0ed4f5b7b1
am cddb2954
: Settings: Make downtime days scrollable.
...
* commit 'cddb29544ae4b7c67c3885eda7d2a485cceb53e6':
Settings: Make downtime days scrollable.
2014-09-10 17:06:32 +00:00
John Spurlock
1e7dbd455e
Settings: Use the same day sequence for downtime.
...
Make the starting day (Monday) the same between
the selection dialog and the summary text.
Bug:17390052
Change-Id: I4f884cb5e02c1cc2642ab05915cd94c655b9f362
2014-09-10 11:57:46 -04:00
John Spurlock
cddb29544a
Settings: Make downtime days scrollable.
...
Bug:17428288
Change-Id: I389aece9d79d002426a0bcb03d4a523293012892
2014-09-10 10:04:44 -04:00
Zoltan Szatmary-Ban
860e1e1f44
Fixing Trusted Credentials Settings crash
...
List adapter's getCount method did not check for the case of uninitialised
data. This CL fixes that.
Bug:17437943
Change-Id: I72d7f2c92aa380b1aaafe0658bd920017ff23906
2014-09-10 12:22:36 +01:00
Matthew Xie
a5d4c1b2be
am 72e5583d
: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
...
* commit '72e5583d2a9af10f2750e9abd23c3d5400e3c789':
Do not remove bonded devices from cached device list upon a device scan
2014-09-10 00:56:06 +00:00
Matthew Xie
72e5583d2a
Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
2014-09-10 00:48:41 +00:00
Carlos Valdivia
cece1cb208
am af85b740
: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
...
* commit 'af85b740461b69d9b52d6d19a81d06f3a15b6507':
SECURITY: Prevent preference intents from exploiting settings.
2014-09-10 00:24:44 +00:00
Carlos Valdivia
af85b74046
Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
2014-09-10 00:16:16 +00:00
Elliott Hughes
6312a72136
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-10 00:15:29 +00:00
Jorim Jaggi
723abba6c5
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-10 00:15:00 +00:00
Matthew Xie
b17031bed0
Do not remove bonded devices from cached device list upon a device scan
...
Bug: 17405122
Change-Id: I3f5cc6ddc8f85d3b6223f9ff60e1d5eeb76c530a
2014-09-09 15:12:43 -07: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
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
56b3f338e7
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:52:13 +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
b89313812d
am 67079996
: Merge "Handle disallowed NFC beam restriction" into lmp-dev
...
* commit '6707999600129286ad362bfc2974e321ff06ec90':
Handle disallowed NFC beam restriction
2014-09-09 20:38:36 +00:00
Adam Lesinski
98739309e1
am 3649045d
: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
...
* commit '3649045d109090f8e5951414179fa87dd68ed519':
Make UsageAccess WarningDialog actually instatiatable.
2014-09-09 20:38:35 +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
PauloftheWest
4cf6dcf6af
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:53:59 +00: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
Carlos Valdivia
92f7615502
SECURITY: Prevent preference intents from exploiting settings.
...
Settings has super powers because it shares the system uid. We prevent
those powers from being exploited by malicious authenticators by
checking the intents those authenticators provide.
We will only launch intents that resolve to Activities that are exported=true
or owned by the same UID as the authenticator.
Bug: 14408627
Change-Id: Ia179df8561d29745767dac0f3c97eb0f68083f59
2014-09-09 11:17:19 -07: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
dbcfc1b736
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:27 +00:00
Zoltan Szatmary-Ban
574db42695
Merge "Update Trusted Credentials screen in settings" into lmp-dev
2014-09-09 11:05:54 +00:00
Baligh Uddin
ce59f5cfcd
Import translations. DO NOT MERGE
...
Change-Id: I20034afe71fda554c3139ad8e56df1fa7ae1ffd4
Auto-generated-cl: translation import
2014-09-08 22:43:25 -07:00
Baligh Uddin
7cfae9df9e
Import translations. DO NOT MERGE
...
Change-Id: I218cab3789ccb371b7ca9cd77388932b88ec5ab1
Auto-generated-cl: translation import
2014-09-08 22:39:52 -07:00
Elliott Hughes
bce031b0ad
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:40:42 +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
5dcec20557
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:54:05 +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
91f76560f8
am e5f84735
: Merge "Disabled SIM Cards in Settings." into lmp-dev
...
* commit 'e5f847357697f15fe0507b9c9a77e85f2c0aeedf':
Disabled SIM Cards in Settings.
2014-09-08 22:08:41 +00:00
PauloftheWest
9128659be8
am d0db988b
: Merge "Material theme updates for Wifi Dialog." into lmp-dev
...
* commit 'd0db988bb635975a366654099fe1ac559283161f':
Material theme updates for Wifi Dialog.
2014-09-08 22:08:40 +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
a40a9a90b3
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:19:29 +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
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
5c86c95513
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:05:32 +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
ce7c033720
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