Jason Monk
f680c69191
am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev
...
* commit '34784ec862d86e2f3b3b115e7c065b052b7bc888':
Fix dashboard shadows on tablets
2015-06-04 16:21:43 +00:00
John Spurlock
11d500c9d1
am dec8f810: am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
...
* commit 'dec8f8107c13a0a6f0ff4e8d65139eb139a20850':
Settings: Add zen rule name warning text.
2015-06-04 16:16:16 +00:00
Jason Monk
34784ec862
Merge "Fix dashboard shadows on tablets" into mnc-dev
2015-06-04 16:14:32 +00:00
Jason Monk
00dccfcbe8
Fix dashboard shadows on tablets
...
Bug: 19600778
Change-Id: I45a773dfa5c6c8cb03f0175c043b836e03a42581
2015-06-04 12:04:30 -04:00
John Spurlock
dec8f8107c
am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
...
* commit 'afa64f45ab40457af9a2a70f9aa795e65167693d':
Settings: Add zen rule name warning text.
2015-06-04 16:04:13 +00:00
Jason Monk
d2a7126de4
am 34bdee37: am 06840b31: am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev
...
* commit '34bdee377c74db609b60e2c650d9ce9dd29ca981':
Fix updates of the enable/disable button
2015-06-04 15:57:26 +00:00
John Spurlock
afa64f45ab
am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
...
* commit '1a1181edde0d8d941161e941f12e6783f25ae43d':
Settings: Add zen rule name warning text.
2015-06-04 15:51:05 +00:00
Jason Monk
34bdee377c
am 06840b31: am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev
...
* commit '06840b31f65e4972c24b7716b29831904d9ee694':
Fix updates of the enable/disable button
2015-06-04 15:44:35 +00:00
John Spurlock
1a1181edde
Merge "Settings: Add zen rule name warning text." into mnc-dev
2015-06-04 15:41:58 +00:00
John Spurlock
7b4d1e2cb8
Settings: Add zen rule name warning text.
...
Bug: 21307309
Change-Id: Id08e3bdebb9a87dc474f2551f17268d655c8b4ea
2015-06-04 11:37:36 -04:00
Jason Monk
5dcedade3f
am 74e687b8: am 3cce5d37: am bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev
...
* commit '74e687b8d1b3a5ad436774a2917338070947f86e':
Fix crash in battery screen
2015-06-04 15:33:28 +00:00
Jason Monk
06840b31f6
am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev
...
* commit 'cd5b97dfad920ca5f84e42f3e0dbb648550637e6':
Fix updates of the enable/disable button
2015-06-04 15:33:07 +00:00
Jason Monk
cd5b97dfad
Merge "Fix updates of the enable/disable button" into mnc-dev
2015-06-04 15:24:28 +00:00
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
Jason Monk
74e687b8d1
am 3cce5d37: am bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev
...
* commit '3cce5d3798f6140b40ac645d4bd8b66b3f960078':
Fix crash in battery screen
2015-06-04 15:21:04 +00:00
Jason Monk
3cce5d3798
am bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev
...
* commit 'bdf3ddadd51daef78434351d341954a0ae3fc56e':
Fix crash in battery screen
2015-06-04 15:09:08 +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
Jason Monk
bdf3ddadd5
Merge "Fix crash in battery screen" into mnc-dev
2015-06-04 14:58:57 +00:00
John Spurlock
c72cfc8a97
am 34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev
...
* commit '34a78be5844f3e12fb6abccef12646d3c800fe7a':
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
2015-06-04 14:58:01 +00:00
Jason Monk
63fbf68a42
Fix updates of the enable/disable button
...
Make the entire ApplicationsState resume and do way too much work
so that we can get a little bit of state.
ApplicationsState could use some refactoring.
Bug: 21518528
Change-Id: Ibb6a2c15948f9bc69490426d4004dc83582087b4
2015-06-04 10:57:31 -04:00
Jason Monk
6880ec09cd
Fix crash in battery screen
...
Also add a fake app item
Bug: 21624653
Change-Id: I1a8598472e014f773d2396a9a08fd03e8e32b400
2015-06-04 10:52:01 -04: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
3307c649c5
am fb8de829: am 1b53d0c2: am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev
...
* commit 'fb8de829b51bf5168590a3a2a468578b5970106f':
Disable owner info when no lock screen
2015-06-04 13:45:31 +00: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
fb8de829b5
am 1b53d0c2: am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev
...
* commit '1b53d0c25be74260dc654b481876a5e2d9ad18a8':
Disable owner info when no lock screen
2015-06-04 13:32:56 +00:00
Jason Monk
1b53d0c25b
am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev
...
* commit '41012d5e7b37fe5c2373f3215612d26331f40ba0':
Disable owner info when no lock screen
2015-06-04 13:20:27 +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
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
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
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
2015-06-04 02:45:40 +00:00
Sanket Padawe
2545ec60a7
am af787a46: am ec3f6e29: am 215e3f03: Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev
...
* commit 'af787a461ae85a1b1703bb2e6596f057b6e8431e':
Display softKeyboard when entering pin for pairing BT device.
2015-06-04 02:22:16 +00:00
Sanket Padawe
af787a461a
am ec3f6e29: am 215e3f03: Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev
...
* commit 'ec3f6e297c28b4a1b774b46a66fe969ebd30f0fa':
Display softKeyboard when entering pin for pairing BT device.
2015-06-04 02:12:48 +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
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
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
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
