Commit Graph

20764 Commits

Author SHA1 Message Date
Jason Monk
41012d5e7b Merge "Disable owner info when no lock screen" into mnc-dev 2015-06-04 13:08:48 +00:00
Jason Monk
2ee08cd962 am 58148481: Merge "Protect against monkey crash" into mnc-dev
* commit '58148481a53381cff75ed74421716690055a2f1d':
  Protect against monkey crash
2015-06-04 13:07:02 +00:00
Jason Monk
58148481a5 Merge "Protect against monkey crash" into mnc-dev 2015-06-04 12:56:17 +00:00
The Android Automerger
7c4a0fed96 merge in mnc-release history after reset to mnc-dev 2015-06-04 01:05:02 -07:00
Jim Miller
dddca46b58 am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev
* commit '471da56938c2ca8102f7740b3eb5704f48d86aff':
  Revert "Fix some dark theme issues"
2015-06-04 02:59:20 +00:00
Jim Miller
471da56938 Merge "Revert "Fix some dark theme issues"" into mnc-dev 2015-06-04 02:52:12 +00:00
Jim Miller
6433bd8f6a Revert "Fix some dark theme issues"
This breaks the pattern entry screens of SecuritySettings.  Reverting until we can take a closer look.


This reverts commit cb8ccbb3b5.

Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227
2015-06-04 02:45:40 +00:00
Sanket Padawe
ec3f6e297c am 215e3f03: Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev
* commit '215e3f03766de0b72aed471d0b22c06e48ab03b2':
  Display softKeyboard when entering pin for pairing BT device.
2015-06-04 01:58:07 +00:00
Sanket Padawe
215e3f0376 Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev 2015-06-04 01:47:50 +00:00
Sanket Padawe
9c4bdc038f Display softKeyboard when entering pin for pairing BT device.
Bug: 18784238
Change-Id: I73bec83aa099a4f63fa055cb67afb095f37dee28
2015-06-03 18:47:25 -07:00
Stuart Scott
01a6351f7a am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev
* commit 'fcf64237b72b506d6f45717d8f7252fb656c5fa4':
  Re-add a string which was accidently removed.
2015-06-04 01:03:15 +00:00
Stuart Scott
fcf64237b7 Merge "Re-add a string which was accidently removed." into mnc-dev 2015-06-04 00:51:17 +00:00
Stuart Scott
1da842af41 Re-add a string which was accidently removed.
bug:20051165
Change-Id: I43214f30650565499ffbdddb3819e96ac957ebf1
2015-06-03 17:01:42 -07:00
Nicolas Prevot
91ec04bdce am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev
* commit '41dbc14eda952203320bc9a64c3d42d98bacee9f':
  In Settings, don't allow to disable an app which is profile/device owner.
2015-06-03 22:25:16 +00:00
Nicolas Prevot
41dbc14eda Merge "In Settings, don't allow to disable an app which is profile/device owner." into mnc-dev 2015-06-03 22:17:11 +00:00
Sanket Padawe
ab0ea0a24f am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling.
* commit '3d32af264254660150c5f2d63a64b3462a9378dd':
  Fix Wifi Settings crash on continuous wifi toggling.
2015-06-03 22:06:01 +00:00
Nicolas Prevot
d0dfdda2f6 In Settings, don't allow to disable an app which is profile/device owner.
In the App Info section of Settings:
If the app is device owner or profile owner of at least one user, disable the
disable button.

BUG: 20831525

Change-Id: Iff00314108caf8c0b209f66060e6655ef06f2aa0
2015-06-03 14:41:39 -07:00
Sanket Padawe
3d32af2642 Fix Wifi Settings crash on continuous wifi toggling.
Bug: 21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60
2015-06-03 14:16:13 -07:00
Jason Monk
0847796339 Disable owner info when no lock screen
Bug: 20514900
Change-Id: I10108d7300e5aa9379c8e8cc7d1b1bb11b8f121e
2015-06-03 16:37:07 -04:00
Jason Monk
28ca64b3d1 Protect against monkey crash
Bug: 19541028
Change-Id: Ia8e477b3c2843b2e841c429ce090ff388958bfcb
2015-06-03 15:43:46 -04:00
Sanket Padawe
04e1d51a64 am fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev
* commit 'fb619a8726cf912e9c9156d8ca06760b641c5171':
  Fix Wifi Signal strength icon issues in WifiSettings.
2015-06-03 19:09:08 +00:00
Sanket Padawe
fb619a8726 Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev 2015-06-03 18:57:47 +00:00
Sanket Padawe
8cde7135b5 Fix Wifi Signal strength icon issues in WifiSettings.
Bug: 21591392
Bug: 21592509
Change-Id: I6612ef62c17e6279b06f80a67bee345e913f1927
2015-06-03 11:54:41 -07:00
Geoff Mendal
01145a1430 am 26e8b0bf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '26e8b0bf7d62c0a9baed5c1b72b5c992d8209377':
  Import translations. DO NOT MERGE
2015-06-03 18:32:09 +00:00
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
The Android Automerger
0dd6777f40 merge in mnc-release history after reset to mnc-dev 2015-06-03 01:04:06 -07: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