OSDN Git Service
Adam Lesinski [Fri, 26 Sep 2014 04:55:25 +0000 (04:55 +0000)]
am
98e858b1: am
581dfee1: am
0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev
* commit '
98e858b1f4a2562bb6e7d35f19b46cc3969eb366':
AAPT: Fix issue with synthesized resource not actually showing up
Adam Lesinski [Fri, 26 Sep 2014 04:40:30 +0000 (04:40 +0000)]
am
581dfee1: am
0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev
* commit '
581dfee1502375bb49fac43af27d8df43e71d51b':
AAPT: Fix issue with synthesized resource not actually showing up
Adam Lesinski [Fri, 26 Sep 2014 01:06:06 +0000 (01:06 +0000)]
am
0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev
* commit '
0a6c5ea412bc1e49aa1e98a6a3fe268081883d4a':
AAPT: Fix issue with synthesized resource not actually showing up
Adam Lesinski [Fri, 26 Sep 2014 00:51:35 +0000 (00:51 +0000)]
Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev
Adam Powell [Fri, 26 Sep 2014 00:40:54 +0000 (00:40 +0000)]
am
5a6ff09d: am
11133a78: am
da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
* commit '
5a6ff09dbcf86f198f7560294220e57631669287':
Always show the name of the last used Home app in ResolverActivity
Adam Powell [Fri, 26 Sep 2014 00:30:50 +0000 (00:30 +0000)]
am
11133a78: am
da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
* commit '
11133a783a0e7b0fc0d725f2d4cd858d2a51ab6e':
Always show the name of the last used Home app in ResolverActivity
Jinsuk Kim [Fri, 26 Sep 2014 00:21:51 +0000 (00:21 +0000)]
am
e802276c: Merge "CEC: Send keys to active routing path" into lmp-mr1-dev
* commit '
e802276cd12cdec416bf7b59364426b0b328be1c':
CEC: Send keys to active routing path
Dianne Hackborn [Fri, 26 Sep 2014 00:21:47 +0000 (00:21 +0000)]
am
31940621: am
801fd360: am
fcc42e8f: Merge "Fix issue #
17661444: Persistent service not automatically restarted" into lmp-dev
* commit '
31940621186b8512adf1d068d3b142a73e23553b':
Fix issue #
17661444: Persistent service not automatically restarted
Adam Powell [Fri, 26 Sep 2014 00:16:26 +0000 (00:16 +0000)]
am
da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
* commit '
da7f9bab0206c237f3d70b3b23eeaab41f478eb1':
Always show the name of the last used Home app in ResolverActivity
Jinsuk Kim [Fri, 26 Sep 2014 00:13:53 +0000 (00:13 +0000)]
Merge "CEC: Send keys to active routing path" into lmp-mr1-dev
Dianne Hackborn [Fri, 26 Sep 2014 00:10:00 +0000 (00:10 +0000)]
am
801fd360: am
fcc42e8f: Merge "Fix issue #
17661444: Persistent service not automatically restarted" into lmp-dev
* commit '
801fd36026b3f355fde91e30c7698a5ff71a5569':
Fix issue #
17661444: Persistent service not automatically restarted
Adam Powell [Fri, 26 Sep 2014 00:07:30 +0000 (00:07 +0000)]
Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
Dianne Hackborn [Fri, 26 Sep 2014 00:00:07 +0000 (00:00 +0000)]
am
fcc42e8f: Merge "Fix issue #
17661444: Persistent service not automatically restarted" into lmp-dev
* commit '
fcc42e8f3375a35dfc92af41fe9303359af84626':
Fix issue #
17661444: Persistent service not automatically restarted
Svetoslav [Thu, 25 Sep 2014 23:59:42 +0000 (23:59 +0000)]
am
f6998583: am
37b75fdd: am
48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev
* commit '
f6998583a4ac65ea9968130226a5acf73e4b2f7e':
Accessibility in bad state after using SDK tool uiautomatorviewer.
Adam Powell [Thu, 25 Sep 2014 23:46:36 +0000 (16:46 -0700)]
Always show the name of the last used Home app in ResolverActivity
Bug
17629220
Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
Dianne Hackborn [Thu, 25 Sep 2014 23:53:13 +0000 (23:53 +0000)]
Merge "Fix issue #
17661444: Persistent service not automatically restarted" into lmp-dev
Svetoslav [Thu, 25 Sep 2014 23:48:32 +0000 (23:48 +0000)]
am
37b75fdd: am
48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev
* commit '
37b75fddfda13c2a407f7b4cce1803b4078293dc':
Accessibility in bad state after using SDK tool uiautomatorviewer.
Dianne Hackborn [Thu, 25 Sep 2014 23:39:40 +0000 (16:39 -0700)]
Fix issue #
17661444: Persistent service not automatically restarted
The code to recover when running processes are removed from the
LRU list turned up an existing problem where we would remove a
persistent process from the LRU list, making it more obvious.
Now it is fixed.
Change-Id: I94ccb924b3e5649b2819d3392b6f6c9c725dc903
Svetoslav [Thu, 25 Sep 2014 23:37:32 +0000 (23:37 +0000)]
am
48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev
* commit '
48ccf04368f65f7988bb589f9c29f94c77bbd549':
Accessibility in bad state after using SDK tool uiautomatorviewer.
Junda Liu [Thu, 25 Sep 2014 23:37:12 +0000 (23:37 +0000)]
am
4c5747ed: Update api/current.txt to unhide APIs by ag/554960
* commit '
4c5747ede6a4aeac12b3239ff34adf6549581e42':
Update api/current.txt to unhide APIs by ag/554960
Svetoslav [Thu, 25 Sep 2014 23:27:00 +0000 (23:27 +0000)]
Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev
Tsuwei Chen [Thu, 25 Sep 2014 23:09:34 +0000 (23:09 +0000)]
am
f4ada994: am
b2ae0d6f: am
e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
* commit '
f4ada994f91bcdfcb421d76faa8ea84540815e7c':
Fix an incorrect behavior that failed AT&T privacy test.
Adrian Roos [Thu, 25 Sep 2014 23:08:59 +0000 (23:08 +0000)]
am
f68e624f: am
a2e1e2ca: am
05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
* commit '
f68e624f77fbd5999085705f314f5eefd418581d':
Ensure that setting an empty password clears it
Eino-Ville Talvala [Thu, 25 Sep 2014 23:08:55 +0000 (23:08 +0000)]
am
55e3fd8e: am
eeb44d4a: am
7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
* commit '
55e3fd8ef50f13327547d1b9999f73727d036b8a':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
Junda Liu [Thu, 25 Sep 2014 21:44:51 +0000 (14:44 -0700)]
Update api/current.txt to unhide APIs by ag/554960
Bug: b/
17639966
Change-Id: Ic11f362b170cf6fa16ce16a606c47f045bee9900
Tsuwei Chen [Thu, 25 Sep 2014 22:56:43 +0000 (22:56 +0000)]
am
b2ae0d6f: am
e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
* commit '
b2ae0d6f320d6f11f31cc82b03ac0fdf36220cc1':
Fix an incorrect behavior that failed AT&T privacy test.
Adrian Roos [Thu, 25 Sep 2014 22:56:39 +0000 (22:56 +0000)]
am
a2e1e2ca: am
05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
* commit '
a2e1e2ca20dba8d163223364b82861b84d180600':
Ensure that setting an empty password clears it
Eino-Ville Talvala [Thu, 25 Sep 2014 22:56:36 +0000 (22:56 +0000)]
am
eeb44d4a: am
7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
* commit '
eeb44d4a77d5dd5050a25cc622bd5e6869e69e14':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
Svetoslav [Thu, 25 Sep 2014 22:56:28 +0000 (15:56 -0700)]
Accessibility in bad state after using SDK tool uiautomatorviewer.
The UiAutormator tool is a part of the SDK. If it is run while
accessibility is enabled it stops all accessibility services
as it is an accessibility service itself to avoid interference
and when done restores back the accessibility state. The issue
was that the accessibility state is not restored leaving the
device in a bad state.
bug:
17662770
Change-Id: I3c4f46fa05c76b874eeffdeb867ef433c3fedf2e
Michael Wright [Thu, 25 Sep 2014 22:50:12 +0000 (22:50 +0000)]
am
b5344ce5: am
57bb094b: am
233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
* commit '
b5344ce5ca726258ec41426203421c7f348adc47':
Specify a device identifier for keyboard layout notification.
Tsuwei Chen [Thu, 25 Sep 2014 22:47:29 +0000 (22:47 +0000)]
am
e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
* commit '
e6e4b2bfa3782f63ed0b4b802e5a9d59a6a48f49':
Fix an incorrect behavior that failed AT&T privacy test.
Adrian Roos [Thu, 25 Sep 2014 22:47:25 +0000 (22:47 +0000)]
am
05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
* commit '
05ade73e580b826ead839d3c5db508a8ea25ad93':
Ensure that setting an empty password clears it
Eino-Ville Talvala [Thu, 25 Sep 2014 22:47:21 +0000 (22:47 +0000)]
am
7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
* commit '
7b6a4acdeb6bddbb6b058c227e037c714dd8f2b8':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
Tsuwei Chen [Thu, 25 Sep 2014 22:43:03 +0000 (22:43 +0000)]
Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
Adrian Roos [Thu, 25 Sep 2014 22:42:41 +0000 (22:42 +0000)]
Merge "Ensure that setting an empty password clears it" into lmp-dev
Michael Wright [Thu, 25 Sep 2014 22:38:38 +0000 (22:38 +0000)]
am
57bb094b: am
233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
* commit '
57bb094b818d0e215cd987738078e5c181c26fac':
Specify a device identifier for keyboard layout notification.
Eino-Ville Talvala [Thu, 25 Sep 2014 22:36:58 +0000 (22:36 +0000)]
Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
Junda Liu [Thu, 25 Sep 2014 22:32:21 +0000 (22:32 +0000)]
am
e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev
* commit '
e069ca2bbf7ba9091c4169de181c850d19734be7':
Revert "Hide CarrierPrivilege APIs in TelMgr."
Michael Wright [Thu, 25 Sep 2014 22:27:05 +0000 (22:27 +0000)]
am
233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
* commit '
233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
Specify a device identifier for keyboard layout notification.
Junda Liu [Thu, 25 Sep 2014 22:24:33 +0000 (22:24 +0000)]
Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev
Michael Wright [Thu, 25 Sep 2014 22:18:19 +0000 (22:18 +0000)]
Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
Eino-Ville Talvala [Thu, 25 Sep 2014 22:04:00 +0000 (22:04 +0000)]
am
4b168708: am
9ceeb831: am
93f0b612: Camera2 legacy: Improve robustness to camera service crashes
* commit '
4b168708a2380bbf48651344cd908fb44f41c05a':
Camera2 legacy: Improve robustness to camera service crashes
Alan Viverette [Thu, 25 Sep 2014 22:03:18 +0000 (22:03 +0000)]
am
e76f1b82: am
a9517205: am
21662c96: Merge "Cut ripple background alpha in half" into lmp-dev
* commit '
e76f1b82e34bdd2152b13994d3524c3a60e73a98':
Cut ripple background alpha in half
Alan Viverette [Thu, 25 Sep 2014 22:03:14 +0000 (22:03 +0000)]
am
df6e14c8: am
c1b3b21e: am
00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev
* commit '
df6e14c8306f838cca2a5ed484a1437d7650c27f':
Fix "Always apply window insets to action modes"
Svetoslav [Thu, 25 Sep 2014 22:03:09 +0000 (22:03 +0000)]
am
5ec87159: am
09b81193: am
85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
* commit '
5ec87159e8a2f33e583af20f1a2c06fcccf00c4a':
Accessibility events may be fired even if no services observe them.
Chris Wren [Thu, 25 Sep 2014 22:03:02 +0000 (22:03 +0000)]
am
1f270a93: am
cf9ee933: am
2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev
* commit '
1f270a93d4ade45a0db694a5241518b9b4549400':
Allow longer translations in the notification actions.
Ruben Brunk [Thu, 25 Sep 2014 22:02:48 +0000 (22:02 +0000)]
am
be8900a9: am
4754428d: am
e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
* commit '
be8900a96b72d26c987feb63432541f721c06c21':
camera2: Fix null check in PictureCallback.
Amith Yamasani [Thu, 25 Sep 2014 22:02:44 +0000 (22:02 +0000)]
am
89d8d175: am
158c51f3: am
95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
* commit '
89d8d175e522f4a8ce77fb3996841d5349162243':
Fix GPS icon not showing for secondary users
John Spurlock [Thu, 25 Sep 2014 22:02:34 +0000 (22:02 +0000)]
am
b1e369bc: am
37c874d0: am
0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
* commit '
b1e369bca1370f6449a53808d4aae71eda9a1ab6':
Supertoast when user changes zen mode.
Tsuwei Chen [Thu, 25 Sep 2014 21:33:08 +0000 (14:33 -0700)]
Fix an incorrect behavior that failed AT&T privacy test.
Bug:
17278951
Change-Id: I8b8bf4ed19af8738e7cef3553c8a06f7e27c7264
Eino-Ville Talvala [Thu, 25 Sep 2014 21:45:33 +0000 (21:45 +0000)]
am
9ceeb831: am
93f0b612: Camera2 legacy: Improve robustness to camera service crashes
* commit '
9ceeb831c412d80b0961bcf38d81c789aba1718b':
Camera2 legacy: Improve robustness to camera service crashes
Eino-Ville Talvala [Thu, 25 Sep 2014 21:34:40 +0000 (21:34 +0000)]
am
93f0b612: Camera2 legacy: Improve robustness to camera service crashes
* commit '
93f0b612350e217b8434a0199ba4723c2cfe0e72':
Camera2 legacy: Improve robustness to camera service crashes
Eino-Ville Talvala [Thu, 25 Sep 2014 19:52:20 +0000 (12:52 -0700)]
Camera2 Legacy: Clear JPEG ids when reconfiguring.
Otherwise, stale IDs for old streams will be left around, causing
JPEGs to be sent to the wrong consumers.
Bug:
17659125
Change-Id: I98e1a1d389147631bc80eaeb10d57f74a6256f32
Eino-Ville Talvala [Tue, 23 Sep 2014 23:37:31 +0000 (16:37 -0700)]
Camera2 legacy: Improve robustness to camera service crashes
When the camera service dies, the getParameters call is often the first
to fail, and on legacy mode, this frequently happens in a background thread.
Catch the runtime exceptions and convert to device errors, instead of killing
the process.
Bug:
17587496
Change-Id: I6757961e7c0387defd368a13cb7c343950602400
Alan Viverette [Thu, 25 Sep 2014 20:26:25 +0000 (20:26 +0000)]
am
a9517205: am
21662c96: Merge "Cut ripple background alpha in half" into lmp-dev
* commit '
a95172054bb02ebd5991e0242e1f7fccbb539ce9':
Cut ripple background alpha in half
Alan Viverette [Thu, 25 Sep 2014 20:26:22 +0000 (20:26 +0000)]
am
c1b3b21e: am
00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev
* commit '
c1b3b21e92c2c4ded106906abae20a6ac75638ab':
Fix "Always apply window insets to action modes"
Svetoslav [Thu, 25 Sep 2014 20:26:15 +0000 (20:26 +0000)]
am
09b81193: am
85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
* commit '
09b811936d5e6c16f8be5ce4921c40ec0f298d29':
Accessibility events may be fired even if no services observe them.
Alan Viverette [Thu, 25 Sep 2014 20:20:02 +0000 (20:20 +0000)]
am
21662c96: Merge "Cut ripple background alpha in half" into lmp-dev
* commit '
21662c96fa9d107a60f4ce98f7179264c972b142':
Cut ripple background alpha in half
Alan Viverette [Thu, 25 Sep 2014 20:14:33 +0000 (20:14 +0000)]
Merge "Cut ripple background alpha in half" into lmp-dev
Alan Viverette [Thu, 25 Sep 2014 20:14:29 +0000 (20:14 +0000)]
am
00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev
* commit '
00660f66ef0344698551c88c0f26663f70e31b5e':
Fix "Always apply window insets to action modes"
Svetoslav [Thu, 25 Sep 2014 20:14:25 +0000 (20:14 +0000)]
am
85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
* commit '
85daf4f04ade8a5d85eab70e63cd184dcb760501':
Accessibility events may be fired even if no services observe them.
Chris Wren [Thu, 25 Sep 2014 20:12:44 +0000 (20:12 +0000)]
am
cf9ee933: am
2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev
* commit '
cf9ee9338a7f9972288b5104ee432e8c8cabb46e':
Allow longer translations in the notification actions.
Alan Viverette [Thu, 25 Sep 2014 20:11:27 +0000 (20:11 +0000)]
Merge "Fix "Always apply window insets to action modes"" into lmp-dev
Svetoslav [Thu, 25 Sep 2014 20:06:19 +0000 (20:06 +0000)]
Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
Alan Viverette [Thu, 25 Sep 2014 20:06:03 +0000 (13:06 -0700)]
Cut ripple background alpha in half
Ripple alpha is supposed to be split evenly between the foreground
ripple layer and the background layer, but the background alpha wasn't
getting adjusted properly.
BUG:
17658817
Change-Id: I7af2f2ed38400a40d4a17da020363c7ae5c71a7b
Chris Wren [Thu, 25 Sep 2014 19:59:06 +0000 (19:59 +0000)]
am
2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev
* commit '
2eb3b974ab5c1f7f1ca79410ea54026f58e35c07':
Allow longer translations in the notification actions.
Chris Wren [Thu, 25 Sep 2014 19:50:32 +0000 (19:50 +0000)]
Merge "Allow longer translations in the notification actions." into lmp-dev
Ruben Brunk [Thu, 25 Sep 2014 19:40:58 +0000 (19:40 +0000)]
am
4754428d: am
e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
* commit '
4754428da2cc3e1224fc6f227ac831fee90c8b96':
camera2: Fix null check in PictureCallback.
Amith Yamasani [Thu, 25 Sep 2014 19:40:54 +0000 (19:40 +0000)]
am
158c51f3: am
95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
* commit '
158c51f3b84f8870d562e12fcd6b1ba672348fd9':
Fix GPS icon not showing for secondary users
John Spurlock [Thu, 25 Sep 2014 19:33:12 +0000 (19:33 +0000)]
am
37c874d0: am
0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
* commit '
37c874d0826dfe0142a317b4d7e0e0bf7b53ec17':
Supertoast when user changes zen mode.
Ruben Brunk [Thu, 25 Sep 2014 19:29:40 +0000 (19:29 +0000)]
am
e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
* commit '
e76ce25ff342d393ffb79ef7e01b09cae5320a73':
camera2: Fix null check in PictureCallback.
Amith Yamasani [Thu, 25 Sep 2014 19:29:36 +0000 (19:29 +0000)]
am
95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
* commit '
95548b395d681b0ecfef341058f282f624ae3862':
Fix GPS icon not showing for secondary users
Ruben Brunk [Thu, 25 Sep 2014 19:22:59 +0000 (19:22 +0000)]
Merge "camera2: Fix null check in PictureCallback." into lmp-dev
John Spurlock [Thu, 25 Sep 2014 19:19:45 +0000 (19:19 +0000)]
am
0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
* commit '
0dccf597f10fd0dc755f42514c470d447c820b20':
Supertoast when user changes zen mode.
Amith Yamasani [Thu, 25 Sep 2014 19:18:23 +0000 (19:18 +0000)]
Merge "Fix GPS icon not showing for secondary users" into lmp-dev
John Spurlock [Thu, 25 Sep 2014 19:08:39 +0000 (19:08 +0000)]
Merge "Supertoast when user changes zen mode." into lmp-dev
Paul Lawrence [Thu, 25 Sep 2014 19:07:45 +0000 (19:07 +0000)]
am
433d70d3: am
7c4b9413: am
56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
* commit '
433d70d348a21a9f2f15c5357a14c3955b751915':
Fix pause when setting pin/pattern/password
RoboErik [Thu, 25 Sep 2014 19:07:41 +0000 (19:07 +0000)]
am
54218f6b: am
10a7dfea: am
504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '
54218f6b7e3c3cd426c91d263d85d20609e57382':
Ensure MediaBrowser state is set to connecting after a reconnect
RoboErik [Thu, 25 Sep 2014 19:07:37 +0000 (19:07 +0000)]
am
a59c7f03: am
dff59b8b: am
23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '
a59c7f03a9db8af35fc37f5076054aab77cde887':
Allow null queues to be set in MediaSession
John Spurlock [Tue, 23 Sep 2014 18:59:51 +0000 (14:59 -0400)]
Supertoast when user changes zen mode.
If the user selects a new zen mode, display a quick toast
with the mode icon + text to aid in association.
Also fix a recent regression in the zen subhead alignment.
Bug:
16215680
Bug:
17641211
Change-Id: I4ead88d81be4d9c26459aed82c47b8c2fb32eafa
Paul Lawrence [Thu, 25 Sep 2014 18:57:20 +0000 (18:57 +0000)]
am
7c4b9413: am
56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
* commit '
7c4b941336300efc04e8842dc21a24f1c17bf345':
Fix pause when setting pin/pattern/password
RoboErik [Thu, 25 Sep 2014 18:57:16 +0000 (18:57 +0000)]
am
10a7dfea: am
504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '
10a7dfeab45c0687d7c866c78403ba6f8e53e624':
Ensure MediaBrowser state is set to connecting after a reconnect
RoboErik [Thu, 25 Sep 2014 18:57:13 +0000 (18:57 +0000)]
am
dff59b8b: am
23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '
dff59b8b8c3735590aa84c0b5ee92c17459bd6b5':
Allow null queues to be set in MediaSession
Junda Liu [Thu, 25 Sep 2014 17:36:48 +0000 (17:36 +0000)]
Revert "Hide CarrierPrivilege APIs in TelMgr."
This reverts commit
b7aa9e4a6338811d4dacc77e6024a0b97a99e5e9.
Change-Id: I212cd4f1b7b45e0523fc47b2a9c2a6b487e9dbb5
Ruben Brunk [Thu, 25 Sep 2014 18:48:27 +0000 (11:48 -0700)]
camera2: Fix null check in PictureCallback.
Bug:
17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
Ye Wen [Thu, 25 Sep 2014 18:44:04 +0000 (18:44 +0000)]
am
272f2321: am
a0945b40: resolved conflicts for merge of
13ff7c17 to lmp-sprout-dev
* commit '
272f232181345089bd0f4a9b8356772204bcc0cb':
Hide carrier app intents in Telephony (1/2)
Paul Lawrence [Thu, 25 Sep 2014 18:42:10 +0000 (18:42 +0000)]
am
56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
* commit '
56a38862d68c3160ae9b049ca89422cc5834e8e3':
Fix pause when setting pin/pattern/password
RoboErik [Thu, 25 Sep 2014 18:42:06 +0000 (18:42 +0000)]
am
504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '
504752fb3833a90f4a226a2027939cb972cb8a9b':
Ensure MediaBrowser state is set to connecting after a reconnect
RoboErik [Thu, 25 Sep 2014 18:42:00 +0000 (18:42 +0000)]
am
23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '
23df1c46b768bb2a1363b6f671b0d0c4879538b7':
Allow null queues to be set in MediaSession
Paul Lawrence [Thu, 25 Sep 2014 18:33:53 +0000 (18:33 +0000)]
Merge "Fix pause when setting pin/pattern/password" into lmp-dev
RoboErik [Thu, 25 Sep 2014 18:28:49 +0000 (18:28 +0000)]
Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
RoboErik [Thu, 25 Sep 2014 18:28:20 +0000 (18:28 +0000)]
Merge "Allow null queues to be set in MediaSession" into lmp-dev
Junda Liu [Thu, 25 Sep 2014 18:27:58 +0000 (18:27 +0000)]
am
8e61b503: am
63f0b87e: am
96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
* commit '
8e61b5036f0c2479b9735255bb409601932806f0':
Hide CarrierPrivilege APIs in TelMgr.
Ye Wen [Thu, 25 Sep 2014 18:27:55 +0000 (18:27 +0000)]
am
a0945b40: resolved conflicts for merge of
13ff7c17 to lmp-sprout-dev
* commit '
a0945b409818052e8bc0e2a8711dbed6b2e56e33':
Hide carrier app intents in Telephony (1/2)
Ye Wen [Thu, 25 Sep 2014 18:20:08 +0000 (11:20 -0700)]
resolved conflicts for merge of
13ff7c17 to lmp-sprout-dev
Change-Id: Ic27b03fa49bb921c36cd2825bf5486903dfd0317
Junda Liu [Thu, 25 Sep 2014 18:17:52 +0000 (18:17 +0000)]
am
63f0b87e: am
96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
* commit '
63f0b87ee3a0df19eec15e73cfbfb9b97623534c':
Hide CarrierPrivilege APIs in TelMgr.
Chris Wren [Thu, 25 Sep 2014 17:52:38 +0000 (17:52 +0000)]
am
cad81c3e: am
3c7f1aac: am
15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
* commit '
cad81c3e473d5af91f83889451070863d0021288':
getCurrentInterruptionFilter should return the filter value, not the hints.
Junda Liu [Thu, 25 Sep 2014 17:46:39 +0000 (17:46 +0000)]
am
96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
* commit '
96c548791145ab33ceb0935f38323d3182d44419':
Hide CarrierPrivilege APIs in TelMgr.
Chris Wren [Thu, 25 Sep 2014 17:41:24 +0000 (17:41 +0000)]
am
3c7f1aac: am
15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
* commit '
3c7f1aacb544db6984a19c933bf9a5975b6c0bf4':
getCurrentInterruptionFilter should return the filter value, not the hints.
Chris Wren [Thu, 25 Sep 2014 17:38:39 +0000 (13:38 -0400)]
Allow longer translations in the notification actions.
Bug:
17345743
Change-Id: Icd0588516cb568ea76e2766f54ba1a61a8f3d997
OSDN Git Service
