Commit Graph

20601 Commits

Author SHA1 Message Date
Nicolas Prevot
058a428dbc am ff9098dd: am bc9a3630: Merge "Don\'t allow secondary users apps to start restricted Settings fragment." into mnc-dev
* commit 'ff9098ddc6905ccd9e102b762df283887456da16':
  Don't allow secondary users apps to start restricted Settings fragment.
2015-06-03 18:48:00 +00:00
Jason Monk
174ed18d90 am 748c9381: am e6d7623c: Merge "Reorder device category" into mnc-dev
* commit '748c938135c73ef6fa3c5d5777d4dd4cf8a8b0e3':
  Reorder device category
2015-06-03 18:47:59 +00:00
Barnaby James
6a441e2aba am fc32d510: am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev
* commit 'fc32d5101dfdf38dbe7c1da4382cedc1015208a5':
  Fix TTS for Zen mode voice activity.
2015-06-03 18:46:07 +00:00
Xiyuan Xia
b2508e10d1 am 3bab71f8: am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev
* commit '3bab71f843e713f1325ae043668442ee9387258f':
  Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
2015-06-03 18:46:05 +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
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
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
Jason Monk
b84c5d3fce am 21c43016: Merge "Dont crash if there is no spellchecker"
* commit '21c430160fe6d9a6e53600ac350e3661802b85aa':
  Dont crash if there is no spellchecker
2015-06-03 13:56:51 +00:00
Jason Monk
21c430160f Merge "Dont crash if there is no spellchecker" 2015-06-03 13:28:58 +00:00
Sanket Padawe
3364ddaa8d am 9b190d18: am fb32790a: Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev
* commit '9b190d1879174c937a26e8bfff3187902543872c':
  Fix Bluetooth device Settings checkbox issue on clicking "Input device"
2015-06-03 02:21:30 +00:00
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
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
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
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
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