John Spurlock
a0d91f6721
am cc8a3ee2: am c72cfc8a: am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev
...
* commit 'cc8a3ee2fe2a30a123b1e8dc9200eeb203fef646':
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
2015-06-04 15:21:33 +00:00
John Spurlock
cc8a3ee2fe
am c72cfc8a: am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev
...
* commit 'c72cfc8a97562999f9ed8292cedfd7132691cb1c':
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
2015-06-04 15:08:27 +00:00
John Spurlock
34a78be584
Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev
2015-06-04 14:48:02 +00:00
John Spurlock
c5bab237f5
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
...
Bug: 21307309
Change-Id: Ic7a9cc124e26340e93a08da45c9f1a0043beee76
2015-06-04 10:44:45 -04:00
Jason Monk
e5791c7de0
am 2a3aeec3: am 2ee08cd9: am 58148481: Merge "Protect against monkey crash" into mnc-dev
...
* commit '2a3aeec398d3d5ef900f68e2134eecb14bec0f1a':
Protect against monkey crash
2015-06-04 13:33:36 +00:00
Jason Monk
2a3aeec398
am 2ee08cd9: am 58148481: Merge "Protect against monkey crash" into mnc-dev
...
* commit '2ee08cd9623403948e8d88345426372f213e135d':
Protect against monkey crash
2015-06-04 13:19:49 +00:00
Jason Monk
58148481a5
Merge "Protect against monkey crash" into mnc-dev
2015-06-04 12:56:17 +00:00
Jim Miller
e7f78bd17b
am 1955fc5f: am dddca46b: am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev
...
* commit '1955fc5fb52d154017c52c069440824ec3d8d27e':
Revert "Fix some dark theme issues"
2015-06-04 03:22:08 +00:00
Jim Miller
1955fc5fb5
am dddca46b: am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev
...
* commit 'dddca46b581e0c40868242cb3952da8b409cc9c6':
Revert "Fix some dark theme issues"
2015-06-04 03:11:42 +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
2015-06-04 02:45:40 +00:00
Stuart Scott
9a8933ab5f
am 9eb4d103: am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev
...
* commit '9eb4d103450b3a6d2682f0ff8d5f8806518ae058':
Re-add a string which was accidently removed.
2015-06-04 01:28:13 +00:00
Stuart Scott
9eb4d10345
am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev
...
* commit '01a6351f7afd4af10538a0b1cf4ed48cd2d7396a':
Re-add a string which was accidently removed.
2015-06-04 01:14:18 +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
decc1a79d1
am e7efc4b2: am 91ec04bd: am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev
...
* commit 'e7efc4b2a726cc2779211bc43c5fade83f08bf0c':
In Settings, don't allow to disable an app which is profile/device owner.
2015-06-03 22:51:18 +00:00
Nicolas Prevot
e7efc4b2a7
am 91ec04bd: am 41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev
...
* commit '91ec04bdce32f24056613f15041c905bf119c533':
In Settings, don't allow to disable an app which is profile/device owner.
2015-06-03 22:38:24 +00:00
Sanket Padawe
6eb55f64ad
am 2613215a: am ab0ea0a2: am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling.
...
* commit '2613215a6fdc683302fd6177ac10bd00736861c9':
Fix Wifi Settings crash on continuous wifi toggling.
2015-06-03 22:36:06 +00:00
Sanket Padawe
50376382df
am 8b81d576: am 04e1d51a: am fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev
...
* commit '8b81d576a7a63116bbcb51b3885df98ab4fe19c4':
Fix Wifi Signal strength icon issues in WifiSettings.
2015-06-03 22:23:27 +00:00
Sanket Padawe
2613215a6f
am ab0ea0a2: am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling.
...
* commit 'ab0ea0a24f062485113de60c76a97a239ece6065':
Fix Wifi Settings crash on continuous wifi toggling.
2015-06-03 22:18:53 +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
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
28ca64b3d1
Protect against monkey crash
...
Bug: 19541028
Change-Id: Ia8e477b3c2843b2e841c429ce090ff388958bfcb
2015-06-03 15:43:46 -04:00
Sanket Padawe
8b81d576a7
am 04e1d51a: am fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev
...
* commit '04e1d51a6467ae41df6604423500e864e0ec7721':
Fix Wifi Signal strength icon issues in WifiSettings.
2015-06-03 19:24:11 +00:00
Jason Monk
53f7cddd94
am 48424d9d: am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev
...
* commit '48424d9def5175cc03ca722bcd73bf7cf3267f9d':
Fix some dark theme issues
2015-06-03 19:23:47 +00:00
Nicolas Prevot
37622f29d8
am 058a428d: am ff9098dd: am bc9a3630: Merge "Don\'t allow secondary users apps to start restricted Settings fragment." into mnc-dev
...
* commit '058a428dbc7b2e16d13a66f8eae47675e517ed50':
Don't allow secondary users apps to start restricted Settings fragment.
2015-06-03 19:23:45 +00:00
Jason Monk
ea0aa049ad
am 174ed18d: am 748c9381: am e6d7623c: Merge "Reorder device category" into mnc-dev
...
* commit '174ed18d90a827814c931e08772bbf408ec4033f':
Reorder device category
2015-06-03 19:23:44 +00:00
Barnaby James
3571671d99
am 6a441e2a: am fc32d510: am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev
...
* commit '6a441e2aba09d350df4834e21d72c43afaea8634':
Fix TTS for Zen mode voice activity.
2015-06-03 19:23:43 +00:00
Xiyuan Xia
8b89e373fd
am b2508e10: am 3bab71f8: am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev
...
* commit 'b2508e10d1d8676d78a466b0c337a71a3d03dbb8':
Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
2015-06-03 19:23:42 +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
Jason Monk
48424d9def
am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev
...
* commit '84cd3bfb43174215abb8648e14e0481380b27828':
Fix some dark theme issues
2015-06-03 18:48:01 +00:00
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
Jason Monk
a3a245219a
am b84c5d3f: am 21c43016: Merge "Dont crash if there is no spellchecker"
...
* commit 'b84c5d3fce61bf302f4cca26fab163638572beaf':
Dont crash if there is no spellchecker
2015-06-03 17:37:15 +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
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
d8ecd66821
am 3364ddaa: am 9b190d18: am fb32790a: Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev
...
* commit '3364ddaa8d031b3a0bc41272a12df51bb5271e26':
Fix Bluetooth device Settings checkbox issue on clicking "Input device"
2015-06-03 02:34:38 +00:00
Jason Monk
bc45beded1
am 7d9c8b27: am 62bb4227: am 6a051168: Merge "Hide search from everywhere but the dashboard" into mnc-dev
...
* commit '7d9c8b27ef172f8ea242cb9d94d1bfebc1c282e2':
Hide search from everywhere but the dashboard
2015-06-03 02:34:36 +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
