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
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
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
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
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
76c88ac405
am 96141ef9: am e854138a: am 6cd24c68: Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev
...
* commit '96141ef9e9151974fde98d942f1b4e62c1f5ffbd':
[WifiSetup] Add + icon to Add another network
2015-06-01 19:13:38 +00:00
Sanket Padawe
4699d796a5
am f90c8a46: am ef2b8dc4: am 0be403db: Merge "Send sim change notification based on sim state change." into mnc-dev
...
* commit 'f90c8a46b86056374cc7eec22a65116dc40aae7f':
Send sim change notification based on sim state change.
2015-06-01 19:06:00 +00:00
Maurice Lam
92b415744e
am 2b323344: am bc04d414: am 83d636a3: Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev
...
* commit '2b32334400c4bd00026327766e24788d737bb752':
[WifiSettings] Remove unused Wi-Fi icon
2015-06-01 19:05:59 +00:00
Stuart Scott
762ea6c8a8
am b4c2ab86: am 1925989e: am 47ed6ca0: Network Reset should have a lockdown like Factory Reset.
...
* commit 'b4c2ab8622604a1e27aea302f59ed40c51e02af2':
Network Reset should have a lockdown like Factory Reset.
2015-06-01 19:05:58 +00:00
Geoff Mendal
9e828654a5
am 7aa2f364: (-s ours) am 8e1a4818: (-s ours) am b16d2a02: (-s ours) Import translations. DO NOT MERGE
...
* commit '7aa2f36495e60a4180fd0bab8654adfebb702c5e':
Import translations. DO NOT MERGE
2015-06-01 19:05:56 +00:00
Maurice Lam
96141ef9e9
am e854138a: am 6cd24c68: Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev
...
* commit 'e854138ad1960e5e884c51626d27dc72fcfc3dfa':
[WifiSetup] Add + icon to Add another network
2015-06-01 19:02:12 +00: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
Maurice Lam
2b32334400
am bc04d414: am 83d636a3: Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev
...
* commit 'bc04d414e31999f05e15f1f3b8e749f8c85a68fc':
[WifiSettings] Remove unused Wi-Fi icon
2015-06-01 18:51:01 +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
Geoff Mendal
7aa2f36495
am 8e1a4818: (-s ours) am b16d2a02: (-s ours) Import translations. DO NOT MERGE
...
* commit '8e1a48180622bb458c191436fcea5db1eb9074d6':
Import translations. DO NOT MERGE
2015-06-01 18:50:18 +00: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
Geoff Mendal
200199bfb7
am 1e554023: (-s ours) am 360f69df: (-s ours) am b777c6e2: (-s ours) Import translations. DO NOT MERGE
...
* commit '1e554023423303b0760e5923717cf8013fb8363f':
Import translations. DO NOT MERGE
2015-06-01 17:27:01 +00:00
Xiyuan Xia
4dea82033c
am cb7312ac: am 89a0ba67: am dc6bd8d2: Merge "Ignore fp error message when not listening" into mnc-dev
...
* commit 'cb7312acd420c59ea7b08e6c14c6537c7d34f613':
Ignore fp error message when not listening
2015-06-01 17:27:00 +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
Geoff Mendal
1e55402342
am 360f69df: (-s ours) am b777c6e2: (-s ours) Import translations. DO NOT MERGE
...
* commit '360f69dfa5961524556e35ef6b5c8ca85b40ac28':
Import translations. DO NOT MERGE
2015-06-01 17:09:41 +00: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