Geoff Mendal
26e8b0bf7d
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-06-03 18:18:44 +00:00
Jason Monk
84cd3bfb43
am 0732a646
: Merge "Fix some dark theme issues" into mnc-dev
...
* commit '0732a646020d97ab38c247cce21674838715c322':
Fix some dark theme issues
2015-06-03 18:12:58 +00:00
Nicolas Prevot
ff9098ddc6
am bc9a3630
: Merge "Don\'t allow secondary users apps to start restricted Settings fragment." into mnc-dev
...
* commit 'bc9a3630bc6dac8f1ba7ecfbb2ec65589519d437':
Don't allow secondary users apps to start restricted Settings fragment.
2015-06-03 18:12:54 +00:00
Jason Monk
748c938135
am e6d7623c
: Merge "Reorder device category" into mnc-dev
...
* commit 'e6d7623ca704e0d42d433e573423611a82d7cd5c':
Reorder device category
2015-06-03 18:12:53 +00:00
Geoff Mendal
7d4b52a1f6
Import translations. DO NOT MERGE
...
Change-Id: Id0f8d1901b248c78ee0903628bde034c9f8addd5
Auto-generated-cl: translation import
2015-06-03 11:04:23 -07:00
Barnaby James
fc32d5101d
am ef0b4362
: Merge "Fix TTS for Zen mode voice activity." into mnc-dev
...
* commit 'ef0b43625c8aa3e8519888e4e185daa77b33dc2a':
Fix TTS for Zen mode voice activity.
2015-06-03 17:42:34 +00:00
Xiyuan Xia
3bab71f843
am d9e92ea5
: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev
...
* commit 'd9e92ea551af6b65deb88ea68a229fac03030d03':
Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
2015-06-03 17:41:16 +00:00
Jason Monk
0732a64602
Merge "Fix some dark theme issues" into mnc-dev
2015-06-03 17:30:54 +00:00
Jason Monk
cb8ccbb3b5
Fix some dark theme issues
...
Bug: 21117509
Bug: 21077345
Bug: 21480587
Change-Id: I61bcd6631288b0e51204ac8bf134c44b2800e0fe
2015-06-03 13:29:16 -04:00
Nicolas Prevot
bc9a3630bc
Merge "Don't allow secondary users apps to start restricted Settings fragment." into mnc-dev
2015-06-03 17:28:34 +00:00
Jason Monk
e6d7623ca7
Merge "Reorder device category" into mnc-dev
2015-06-03 17:22:00 +00:00
Jason Monk
f48c89ff7c
Reorder device category
...
Bug: 21588753
Change-Id: Ie01ad44b3bc9d2d3cac165e25b72a112896d4d2c
2015-06-03 13:18:07 -04:00
Barnaby James
ef0b43625c
Merge "Fix TTS for Zen mode voice activity." into mnc-dev
2015-06-03 17:09:56 +00:00
Xiyuan Xia
d9e92ea551
Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev
2015-06-03 16:07:42 +00:00
Nicolas Prevot
a5df4779a0
Don't allow secondary users apps to start restricted Settings fragment.
...
On a secondary user, the fragments ApnSettings, TetherSettings and VpnSettings
should not be started.
But an app can still send an intent to start these fragments.
Prevent this by checkin the userId in these fragments.
BUG:15313261
BUG:15312781
BUG:15312494
Change-Id: I2a36bb89a8e37e4440aa28372d7a1800b33dae37
2015-06-02 16:49:20 -07:00
Sanket Padawe
9b190d1879
am fb32790a
: Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev
...
* commit 'fb32790adc9ed647ad4e77c9613a860f9b76e855':
Fix Bluetooth device Settings checkbox issue on clicking "Input device"
2015-06-02 23:15:42 +00:00
Sanket Padawe
fb32790adc
Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev
2015-06-02 23:04:24 +00:00
Sanket Padawe
0da0573b70
Fix Bluetooth device Settings checkbox issue on clicking "Input device"
...
Bug: 19937357
Change-Id: I6f74577a062df407e50972b84dd4e5d7d2da529b
2015-06-02 16:00:43 -07:00
Jason Monk
62bb4227da
am 6a051168
: Merge "Hide search from everywhere but the dashboard" into mnc-dev
...
* commit '6a05116804c9b849bf3aa634df3e90cc216abc88':
Hide search from everywhere but the dashboard
2015-06-02 22:48:49 +00:00
Jason Monk
6a05116804
Merge "Hide search from everywhere but the dashboard" into mnc-dev
2015-06-02 22:39:08 +00:00
Xiyuan Xia
4458fd6e57
Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
...
- Revert previous "Add announceForAccessibility to ConfirmLockPattern";
- Add android:accessibilityLiveRegion="polite" for errorText in
ConfirmLockPassword/Pattern;
Bug:20282779
Change-Id: I4b9c0d461d0dd0504bd88a8a2144e09a42d5f64e
2015-06-02 15:27:59 -07:00
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
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
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