Jason Monk
7d9c8b27ef
am 62bb4227: am 6a051168: Merge "Hide search from everywhere but the dashboard" into mnc-dev
...
* commit '62bb4227da8962642fb9f34161a016c80ab74c0b':
Hide search from everywhere but the dashboard
2015-06-03 02:21:00 +00:00
Jason Monk
6a05116804
Merge "Hide search from everywhere but the dashboard" into mnc-dev
2015-06-02 22:39:08 +00:00
Adrian Roos
62b92ab53d
am 63a885d3: am 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev
...
* commit '63a885d39f2acdf59a348d9d9f558327ff0b5780':
Only show emergency app preference if enabled
2015-06-02 21:16:29 +00:00
Jason Monk
3eccde2e05
am 8c48a9b1: am 0d7d9272: Change DeviceProfilesSettings to DialogFragment
...
* commit '8c48a9b11961d41c8a090d38daeb972462dcec45':
Change DeviceProfilesSettings to DialogFragment
2015-06-02 21:16:28 +00:00
Jason Monk
f723447cbf
am 84abde71: am 1b7bff11: Merge "Fix battery usage screen issues" into mnc-dev
...
* commit '84abde71471b6631d7f12f47ef9c92360cbdbafc':
Fix battery usage screen issues
2015-06-02 21:10:27 +00:00
Sanket Padawe
e6ac3ad937
am 3e3ff42a: am 6a6ae2dc: Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings." into mnc-dev
...
* commit '3e3ff42a811576d73f215434baa0cf8138e7c6f4':
Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.
2015-06-02 21:08:58 +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
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
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
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
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
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
Robin Lee
c409605356
Clear connected legacy VPN during rescan
...
Change-Id: I0fec37b3f73ce5b538721d79e78e1128d7667380
2015-06-01 18:45:40 -07: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
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
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
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
Sanket Padawe
f90c8a46b8
am ef2b8dc4: am 0be403db: Merge "Send sim change notification based on sim state change." into mnc-dev
...
* commit 'ef2b8dc47ec28ade46c180813452898ee4b42ec4':
Send sim change notification based on sim state change.
2015-06-01 18:51:55 +00:00
Stuart Scott
b4c2ab8622
am 1925989e: am 47ed6ca0: Network Reset should have a lockdown like Factory Reset.
...
* commit '1925989ed9b91a1426a14346a6f687173e98b868':
Network Reset should have a lockdown like Factory Reset.
2015-06-01 18:50:47 +00:00
Sanket Padawe
0be403dbed
Merge "Send sim change notification based on sim state change." into mnc-dev
2015-06-01 17:55:12 +00:00
Sanket Padawe
9d7eb49e7b
Send sim change notification based on sim state change.
...
+ Send sim change notifications based on Sim state change rather then based
on subscription change.
+ Make SimSettings dynamically update based on subscriptions changed. Would
support hotswap which was not supported before this.
Bug: 20739298
Bug: 18385348
Change-Id: I5bb4b05f55b94eb0ed2a1a83fe2f168192b2b684
2015-06-01 10:25:46 -07:00
Xiyuan Xia
cb7312acd4
am 89a0ba67: am dc6bd8d2: Merge "Ignore fp error message when not listening" into mnc-dev
...
* commit '89a0ba67ff06be4d4fc842b25197b19ff01b85f9':
Ignore fp error message when not listening
2015-06-01 17:08:24 +00:00
Stuart Scott
47ed6ca004
Network Reset should have a lockdown like Factory Reset.
...
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
(cherry picked from commit 176f512c5a )
2015-06-01 16:30:48 +00:00
Fyodor Kupolov
222ebbafc1
am 59e340d7: am 097936ad: Hide guest entry if the user is not allowed to create guest
...
* commit '59e340d735b3b74b9eb6726f45f740c17302b740':
Hide guest entry if the user is not allowed to create guest
2015-06-01 15:28:14 +00:00
Fyodor Kupolov
aeaf219eae
am 8a1683f2: am 01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev
...
* commit '8a1683f24555803c853c6f86d8dff1355eeaf666':
Use DimmableIconPreference for Add user action
2015-06-01 15:27:23 +00:00
Fyodor Kupolov
4f621f5126
am 8e998b71: am 2defc457: Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev
...
* commit '8e998b71f0cdba1c85cadaebb4dfc8e80bd0ac52':
Hide the collapse/expand icon if text fits the screen
2015-06-01 15:27:21 +00:00
Tony Mantler
9e05e53691
am 55cd8fe3: am 3e7f2b44: Merge "Move ZoneGetter into SettingsLib" into mnc-dev
...
* commit '55cd8fe3150fb4e7470dbbce58cbbab45373d3e5':
Move ZoneGetter into SettingsLib
2015-06-01 14:46:25 +00:00
John Spurlock
48018ddc72
am 08788dcc: am 00e39238: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
...
* commit '08788dccaf733d855b7a2391095076a642b697f9':
Settings: Migrate zen event conditions to use calendar name.
2015-06-01 14:46:23 +00:00
Xiyuan Xia
dc6bd8d2f1
Merge "Ignore fp error message when not listening" into mnc-dev
2015-05-30 03:28:52 +00:00
Xiyuan Xia
f1bc6e52b5
Ignore fp error message when not listening
...
Bug:21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
2015-05-29 16:19:29 -07:00
Fyodor Kupolov
097936ad1b
Hide guest entry if the user is not allowed to create guest
...
Don't show the Guest entry for a secondary user if the user is not allowed to
create a guest and there is currently no guest already created.
Bug: 19035769
Change-Id: Icf4a778533affaec0658af4da5ce000eda261f38
2015-05-29 14:07:12 -07:00
Fyodor Kupolov
01f35ce46e
Merge "Use DimmableIconPreference for Add user action" into mnc-dev
2015-05-29 20:42:55 +00:00
Fyodor Kupolov
2defc457bd
Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev
2015-05-29 20:27:15 +00:00
Fyodor Kupolov
1c8600b0c8
Hide the collapse/expand icon if text fits the screen
...
Icon should be hidden if explanation text fits the screen, otherwise user
should be able to click the image to collapse/expand the text.
Bug: 20554398
Change-Id: I7fb06be6e6c195a5c1bcac504f4af2d67ef4211e
2015-05-29 11:21:42 -07:00
Tony Mantler
3e7f2b4458
Merge "Move ZoneGetter into SettingsLib" into mnc-dev
2015-05-29 16:44:48 +00:00
John Spurlock
00e392387b
Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
2015-05-29 13:22:36 +00:00
John Spurlock
bd352af3cf
Settings: Migrate zen event conditions to use calendar name.
...
And make sure any existing calendar value always appears in the
picker, even before it exists in the calendar provider.
Bug: 17755700
Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121
2015-05-28 22:20:44 -04:00