Adrian Roos
63a885d39f
am 96e25b8d
: Merge "Only show emergency app preference if enabled" into mnc-dev
...
* commit '96e25b8d938082715f93bd071eb386a2174b910d':
Only show emergency app preference if enabled
2015-06-02 20:55:01 +00:00
Jason Monk
8c48a9b119
am 0d7d9272
: Change DeviceProfilesSettings to DialogFragment
...
* commit '0d7d927216e536ead911f4949134ca362af345ab':
Change DeviceProfilesSettings to DialogFragment
2015-06-02 20:54:59 +00:00
Adrian Roos
96e25b8d93
Merge "Only show emergency app preference if enabled" into mnc-dev
2015-06-02 20:50:45 +00:00
Jason Monk
ea8b1a7dc5
Hide search from everywhere but the dashboard
...
Because it is too confusing what it does/doesn't search.
Bug: 21556767
Change-Id: Ib162177ce3eea816344d8d0fd5d71f85bfc94183
2015-06-02 16:47:56 -04:00
Jason Monk
0d7d927216
Change DeviceProfilesSettings to DialogFragment
...
This makes the lifecycle simpler to fix a crash after rotation.
Also do some adjusting of alignment while here.
Bug: 21444336
Bug: 21205689
Change-Id: I67eccf4833f53b5e5088ae5e6038d041e8653565
2015-06-02 16:33:57 -04:00
Xiyuan Xia
37e6aaae82
am d986f363
: am 4fe4d1e6
: am 279c7ad7
: Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev
...
* commit 'd986f36309b69c694383e6eb946336de3100fe17':
Add announceForAccessibility to ConfirmLockPattern
2015-06-02 20:32:01 +00:00
Robin Lee
e1f7b6810d
am 1bbabd3c
: am 32096856
: am 81ae7913
: Merge "Clear connected legacy VPN during rescan" into mnc-dev
...
* commit '1bbabd3c3642bd81cd838a9801212704fdb41d50':
Clear connected legacy VPN during rescan
2015-06-02 20:32:00 +00:00
Jason Monk
84abde7147
am 1b7bff11
: Merge "Fix battery usage screen issues" into mnc-dev
...
* commit '1b7bff11af6eba5e16dc4ef37dd18d4360c0e03f':
Fix battery usage screen issues
2015-06-02 20:22:17 +00:00
Jason Monk
1b7bff11af
Merge "Fix battery usage screen issues" into mnc-dev
2015-06-02 20:09:17 +00:00
Jason Monk
f2819e0ead
Fix battery usage screen issues
...
Tint icons properly
Bug: 21077770
Show better icons for wifi and bt (remove the old ones)
Bug: 21172936
Also add a way to show fake items in power list for testing.
Change-Id: I6b6804673a68190ebc3f2ea32802e30811a7f5b2
2015-06-02 16:03:32 -04:00
Sanket Padawe
3e3ff42a81
am 6a6ae2dc
: Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings." into mnc-dev
...
* commit '6a6ae2dc8401eafdb1710c97c4b07aa53c797ba1':
Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.
2015-06-02 18:22:48 +00:00
Sanket Padawe
6a6ae2dc84
Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings." into mnc-dev
2015-06-02 18:14:31 +00:00
Sanket Padawe
8a7472b594
Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.
...
Bug: 18048121
Change-Id: If837a58a4840be3d5b9f3cc16ecb261d9ab4420a
2015-06-02 11:13:01 -07:00
Hemant Gupta
591a293a23
am 0f644c30
: am 8e6d735f
: am b8df8a29
: Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
...
* commit '0f644c3028840c76cc6e8c6358ad15d50f4e88f7':
Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
2015-06-02 16:57:29 +00:00
Andre Eisenbach
b43a663ec7
am a69b8d12
: am 1cf03ebb
: am 7292d892
: Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev
...
* commit 'a69b8d12a5585a4d0500a0633ef9e6b25fdb96c9':
Bluetooth PAN: Set isPreferred to true (2/2)
2015-06-02 16:57:27 +00:00
Andres Morales
fe44bd8f77
am ca7e5073
: am 1db27d04
: am 6c91ae68
: Merge "[MasterClear] fix race in showing dialog" into mnc-dev
...
* commit 'ca7e50732f363b10675f2e46380d2ea80c1b767a':
[MasterClear] fix race in showing dialog
2015-06-02 16:57:23 +00:00
Sanket Padawe
0b18ca5613
am 7ae9d9bb
: am 64ec3868
: am afa6361d
: Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev
...
* commit '7ae9d9bb1352fda4dffc14fd4a80d38e874f1053':
Fix scrolling issue for Wifi hotspot setup layout.
2015-06-02 16:57:21 +00:00
Xiyuan Xia
d986f36309
am 4fe4d1e6
: am 279c7ad7
: Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev
...
* commit '4fe4d1e63e15051f887a8bba58302797c51b2c62':
Add announceForAccessibility to ConfirmLockPattern
2015-06-02 16:15:35 +00:00
Robin Lee
1bbabd3c36
am 32096856
: am 81ae7913
: Merge "Clear connected legacy VPN during rescan" into mnc-dev
...
* commit '320968561d6c8d4b4ec1797ff4a2028713b8cc8e':
Clear connected legacy VPN during rescan
2015-06-02 16:15:34 +00:00
Xiyuan Xia
4fe4d1e63e
am 279c7ad7
: Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev
...
* commit '279c7ad7f02d466ac0959dcd90cbd4102afff4fb':
Add announceForAccessibility to ConfirmLockPattern
2015-06-02 15:50:28 +00:00
Robin Lee
320968561d
am 81ae7913
: Merge "Clear connected legacy VPN during rescan" into mnc-dev
...
* commit '81ae79132f022fe93be24aa419ad1dd28ba86fd7':
Clear connected legacy VPN during rescan
2015-06-02 15:50:27 +00:00
Xiyuan Xia
279c7ad7f0
Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev
2015-06-02 15:45:18 +00:00
Robin Lee
81ae79132f
Merge "Clear connected legacy VPN during rescan" into mnc-dev
2015-06-02 15:37:20 +00:00
Hemant Gupta
0f644c3028
am 8e6d735f
: am b8df8a29
: Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
...
* commit '8e6d735f98b12aaffbb01e39ffc9d87617a799b3':
Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
2015-06-02 14:24:52 +00:00
Andre Eisenbach
a69b8d12a5
am 1cf03ebb
: am 7292d892
: Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev
...
* commit '1cf03ebb72d57be8b0aac8f648898d78c8047436':
Bluetooth PAN: Set isPreferred to true (2/2)
2015-06-02 14:24:51 +00:00
Andres Morales
ca7e50732f
am 1db27d04
: am 6c91ae68
: Merge "[MasterClear] fix race in showing dialog" into mnc-dev
...
* commit '1db27d04293eebf24660d50803b9c2e2c1741672':
[MasterClear] fix race in showing dialog
2015-06-02 14:23:34 +00:00
Sanket Padawe
7ae9d9bb13
am 64ec3868
: am afa6361d
: Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev
...
* commit '64ec3868378f8487218b0a618c138a038d548de0':
Fix scrolling issue for Wifi hotspot setup layout.
2015-06-02 14:21:20 +00:00
Hemant Gupta
8e6d735f98
am b8df8a29
: Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
...
* commit 'b8df8a29bf26a500d2f83a79bc09e78c8811041b':
Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
2015-06-02 09:44:39 +00:00
Andre Eisenbach
1cf03ebb72
am 7292d892
: Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev
...
* commit '7292d89280f7c4814e8fa93903dc73e3515b6558':
Bluetooth PAN: Set isPreferred to true (2/2)
2015-06-02 09:44:38 +00:00
Hemant Gupta
b8df8a29bf
Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
...
This patch acquires a wakelock to turn on the LCD display if the screen
is off during an access request for MAP. Without this patch it was
observed that if the screen was off, the LCD remained off for incoming
connection access request from remote devices and the user only heard
the notification sound without the LDC being lit up.
Change-Id: I87c296fce4cd8e0c133f74169d991eee263fed08
2015-06-02 02:24:28 -07:00
Andre Eisenbach
7292d89280
Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev
2015-06-02 09:00:31 +00:00
Andre Eisenbach
901ce5de8d
Bluetooth PAN: Set isPreferred to true (2/2)
...
isPreferred must always be true for PAN so that the DUT can initiate
a PANU connection with the remote device not only from the internet
access menu in the profile setting, but also from the paired device
list menu.
Currently isPreferred is only true when PAN is in connected state
for the PANU role, so it will return false when the PAN profile is
not connected and the PANU connection will never be initiated
from the paired device list menu.
Change-Id: I3d52d89136269508ac6416b695b22842f4bb557a
2015-06-02 01:59:37 -07:00
The Android Automerger
d97e583f2a
merge in mnc-release history after reset to mnc-dev
2015-06-02 01:03:58 -07:00
Robin Lee
c409605356
Clear connected legacy VPN during rescan
...
Change-Id: I0fec37b3f73ce5b538721d79e78e1128d7667380
2015-06-01 18:45:40 -07:00
Andres Morales
1db27d0429
am 6c91ae68
: Merge "[MasterClear] fix race in showing dialog" into mnc-dev
...
* commit '6c91ae68d98431142a5ea3a92601535e5d6c91f0':
[MasterClear] fix race in showing dialog
2015-06-02 01:20:32 +00:00
Andres Morales
6c91ae68d9
Merge "[MasterClear] fix race in showing dialog" into mnc-dev
2015-06-02 01:09:31 +00:00
Andres Morales
c17ec1be19
[MasterClear] fix race in showing dialog
...
Wiping the PDB effectively starves all other threads from
accessing flash, and freezes the UI. We throw up a dialog
but there's a race between drawing the dialog and starting the
wipe.
Show the dialog in onPreExecute to fix this.
Bug: 20854355
Change-Id: I8462f5ed3ff53ed574ebc1be416a821c2086b4f5
2015-06-01 16:23:41 -07:00
Sanket Padawe
64ec386837
am afa6361d
: Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev
...
* commit 'afa6361d36f522b4361c4a91a33edd39d322363a':
Fix scrolling issue for Wifi hotspot setup layout.
2015-06-01 22:34:20 +00:00
Sanket Padawe
afa6361d36
Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev
2015-06-01 22:21:52 +00:00
Sanket Padawe
346625ad8f
Fix scrolling issue for Wifi hotspot setup layout.
...
Bug: 19856113
Change-Id: Id49ac7c452f10e0de43b18ecdecc68619faecbc3
2015-06-01 15:18:48 -07:00
Xiyuan Xia
6e2a039b1f
Add announceForAccessibility to ConfirmLockPattern
...
This makes Talkback in ConfirmLockPattern works similarly as
in ConfirmLockPassword to read out error messages.
Bug:20282779
Change-Id: Ied05c284e959539cfbff965f33edd51c3bdfc9f9
2015-06-01 15:10:08 -07:00
Jason Monk
36457e06d0
am 8b8092aa
: am 3974d3d4
: am ef1d4b66
: Merge "Make Theme a DropDownPreference" into mnc-dev
...
* commit '8b8092aa0995e403cba09b19f955aa2bef00974a':
Make Theme a DropDownPreference
2015-06-01 20:33:09 +00:00
Jason Monk
8b8092aa09
am 3974d3d4
: am ef1d4b66
: Merge "Make Theme a DropDownPreference" into mnc-dev
...
* commit '3974d3d4e6f523bd743aa0078b68d366f64b4661':
Make Theme a DropDownPreference
2015-06-01 20:20:50 +00:00
Jason Monk
44cf2f9f39
am 75059f1a
: am b77a8177
: am 0d2eea38
: Merge "Change name of search menu item to be more descriptive" into mnc-dev
...
* commit '75059f1ac43c536eba3a281270a432ec235778cc':
Change name of search menu item to be more descriptive
2015-06-01 20:20:20 +00:00
Jason Monk
3974d3d4e6
am ef1d4b66
: Merge "Make Theme a DropDownPreference" into mnc-dev
...
* commit 'ef1d4b66abd4e3c1ff4759a4dba7f7f5947af2d3':
Make Theme a DropDownPreference
2015-06-01 20:06:52 +00:00
Jason Monk
75059f1ac4
am b77a8177
: am 0d2eea38
: Merge "Change name of search menu item to be more descriptive" into mnc-dev
...
* commit 'b77a81773480b374b2ccf9ee3ae9dd430663c2d4':
Change name of search menu item to be more descriptive
2015-06-01 20:06:25 +00:00
Jason Monk
b77a817734
am 0d2eea38
: Merge "Change name of search menu item to be more descriptive" into mnc-dev
...
* commit '0d2eea38bf79a76a3179259442116a995dcb2e6f':
Change name of search menu item to be more descriptive
2015-06-01 19:55:14 +00:00
Jason Monk
ef1d4b66ab
Merge "Make Theme a DropDownPreference" into mnc-dev
2015-06-01 19:54:53 +00:00
Jason Monk
3d95908e02
Make Theme a DropDownPreference
...
Also make DropDownPreference support xml lists defined the same
way as ListPreferences.
Bug: 21300431
Change-Id: I1698e8ddcd6134034c3367a6afe36f9740e9efec
2015-06-01 15:49:17 -04:00
Jason Monk
0d2eea38bf
Merge "Change name of search menu item to be more descriptive" into mnc-dev
2015-06-01 19:45:27 +00:00