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
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
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
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
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
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
Jason Monk
e5d14dc606
Change name of search menu item to be more descriptive
...
(for accessibility)
Bug: 20345352
Change-Id: Id8c74f4bf3753dc36153965923859315ecc07a9a
2015-06-01 15:21:07 -04:00
Maurice Lam
e854138ad1
am 6cd24c68
: Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev
...
* commit '6cd24c687d9bdc2a69796e795fa86d6d95c9b60d':
[WifiSetup] Add + icon to Add another network
2015-06-01 18:49:41 +00:00
Maurice Lam
6cd24c687d
Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev
2015-06-01 18:40:47 +00:00
Sanket Padawe
ef2b8dc47e
am 0be403db
: Merge "Send sim change notification based on sim state change." into mnc-dev
...
* commit '0be403dbeddefc2cbb98235518aac7fdc47ad93a':
Send sim change notification based on sim state change.
2015-06-01 18:05:17 +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
Maurice Lam
bc04d414e3
am 83d636a3
: Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev
...
* commit '83d636a3fbe89131d111085cc68b54e323f09259':
[WifiSettings] Remove unused Wi-Fi icon
2015-06-01 17:32:34 +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
Maurice Lam
83d636a3fb
Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev
2015-06-01 17:17:19 +00:00
Stuart Scott
1925989ed9
am 47ed6ca0
: Network Reset should have a lockdown like Factory Reset.
...
* commit '47ed6ca004dcfe9498269602b109b1e667fae287':
Network Reset should have a lockdown like Factory Reset.
2015-06-01 16:44:06 +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
Geoff Mendal
8e1a481806
am b16d2a02
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b16d2a0242e1709e7abe3683f96703ec576719da':
Import translations. DO NOT MERGE
2015-06-01 16:28:59 +00:00
Geoff Mendal
b16d2a0242
Import translations. DO NOT MERGE
...
Change-Id: Idf3b09809f2f964abef75349083eb11a2bfc7a8c
Auto-generated-cl: translation import
2015-06-01 09:09:54 -07:00
The Android Automerger
e7fedeeb0c
merge in mnc-release history after reset to mnc-dev
2015-05-31 01:03:46 -07:00
Geoff Mendal
360f69dfa5
am b777c6e2
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b777c6e20541a01f4219e1020445d091fbfe3217':
Import translations. DO NOT MERGE
2015-05-30 22:42:32 +00:00
Geoff Mendal
b777c6e205
Import translations. DO NOT MERGE
...
Change-Id: I2a83b506d2d5c74818178dbc76b07b2f97ff2c87
Auto-generated-cl: translation import
2015-05-30 17:28:38 -05:00
The Android Automerger
bf7e76293a
merge in mnc-release history after reset to mnc-dev
2015-05-30 01:06:23 -07:00
Maurice Lam
abaca6627b
[WifiSettings] Remove unused Wi-Fi icon
...
wifi_signal_light was replaced by wifi_signal (which can take any
color via theme attributes). Remove the unused assets.
Change-Id: If1823f9fa74ddaeb54f4a79a5d42db3b24f723d9
2015-05-29 20:38:44 -07:00
Xiyuan Xia
89a0ba67ff
am dc6bd8d2
: Merge "Ignore fp error message when not listening" into mnc-dev
...
* commit 'dc6bd8d2f1b2b5f28d59d00ef178e64229ab59ef':
Ignore fp error message when not listening
2015-05-30 03:38:09 +00:00
Maurice Lam
8dc986216c
[WifiSetup] Add + icon to Add another network
...
Add the + icon to "Add another network" in Wi-Fi screen in setup
wizard, and make the text black and sentence case.
Bug: 21089864
Change-Id: Iccfc5fc4ff5e50a599f3004a20e5cfa24a13043a
2015-05-29 20:34:03 -07:00
Xiyuan Xia
dc6bd8d2f1
Merge "Ignore fp error message when not listening" into mnc-dev
2015-05-30 03:28:52 +00:00