OSDN Git Service
Sreeram Ramachandran [Tue, 22 Jul 2014 23:53:25 +0000 (23:53 +0000)]
am
a4a22918: am
bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev
* commit '
a4a229185c60f4abf6674adc6a49e5ab7000fb16':
Cleanup: Delete dead code.
Christopher Tate [Tue, 22 Jul 2014 23:53:21 +0000 (23:53 +0000)]
am
8b9f6619: am
ef76d6a4: Merge "Handle single-package restores properly" into lmp-dev
* commit '
8b9f6619830d5291b16d13ce211a5b7542417907':
Handle single-package restores properly
John Spurlock [Tue, 22 Jul 2014 23:53:13 +0000 (23:53 +0000)]
am
b3d83469: am
3524c495: Merge "BatterySaver: Make the bars orange." into lmp-dev
* commit '
b3d834695725aafcb79f75d7bc8e1bba1da3f7e3':
BatterySaver: Make the bars orange.
Sreeram Ramachandran [Tue, 22 Jul 2014 23:48:52 +0000 (23:48 +0000)]
am
bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev
* commit '
bfea100c342c640efc001af733e9dff7355e16fd':
Cleanup: Delete dead code.
Christopher Tate [Tue, 22 Jul 2014 23:48:48 +0000 (23:48 +0000)]
am
ef76d6a4: Merge "Handle single-package restores properly" into lmp-dev
* commit '
ef76d6a48709a99f6e49c0c2100ba2e0c4a083dd':
Handle single-package restores properly
John Spurlock [Tue, 22 Jul 2014 23:48:43 +0000 (23:48 +0000)]
am
3524c495: Merge "BatterySaver: Make the bars orange." into lmp-dev
* commit '
3524c4956c378515fc8595676d6cc2bfc927e588':
BatterySaver: Make the bars orange.
Andrew Lee [Tue, 22 Jul 2014 23:45:10 +0000 (23:45 +0000)]
am
327d6793: am
195f16be: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
* commit '
327d6793854896bc8dc6fcdea65e7dfbf9f41a29':
Don't throw RemoteException in public RemoteCallVideoClient APIs.
Winson Chung [Tue, 22 Jul 2014 23:45:05 +0000 (23:45 +0000)]
am
c4544b2b: am
6dcd490f: Always enable HW layers on task views. (Bug
15986310)
* commit '
c4544b2b8a2b8655923e6a9c8e77acc6220b15ba':
Always enable HW layers on task views. (Bug
15986310)
Andrew Lee [Tue, 22 Jul 2014 23:40:18 +0000 (23:40 +0000)]
am
195f16be: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
* commit '
195f16be459635f732561aa0e25f84e3e8c76216':
Don't throw RemoteException in public RemoteCallVideoClient APIs.
Winson Chung [Tue, 22 Jul 2014 23:40:12 +0000 (23:40 +0000)]
am
6dcd490f: Always enable HW layers on task views. (Bug
15986310)
* commit '
6dcd490f981843e9993cef8431781c46d49befc5':
Always enable HW layers on task views. (Bug
15986310)
Winson Chung [Tue, 22 Jul 2014 23:30:37 +0000 (16:30 -0700)]
Always enable HW layers on task views. (Bug
15986310)
- Use color filter to apply dim to the task view layer
- Fixing bug where you would see a flash of the task view when animating out of Recents.
RoboErik [Tue, 22 Jul 2014 23:07:30 +0000 (23:07 +0000)]
am
390f77b3: am
befdf350: Move return out of debug conditional
* commit '
390f77b31b6c0cf71578e636154715fe462bcd93':
Move return out of debug conditional
RoboErik [Tue, 22 Jul 2014 23:03:40 +0000 (23:03 +0000)]
am
befdf350: Move return out of debug conditional
* commit '
befdf350a6e0b897a7d6825523de9875403d1a85':
Move return out of debug conditional
RoboErik [Tue, 22 Jul 2014 22:58:22 +0000 (15:58 -0700)]
Move return out of debug conditional
Accidentally put the return for not sending volume changes into
the debug conditional.
bug:
16379124
Change-Id: I473f6fdf7577ca26559ab9b02f4dc0613ef702e3
Andrew Lee [Tue, 22 Jul 2014 22:51:14 +0000 (22:51 +0000)]
am
aebbc98b: am
601e5f54: Merge "Revert "Don\'t throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev
* commit '
aebbc98b10ac54568d835841f932e1b0f2d05266':
Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."
Christopher Tate [Tue, 22 Jul 2014 22:47:06 +0000 (22:47 +0000)]
am
96448307: am
258e43ce: Merge "Always check restore against the latest backend metadata" into lmp-dev
* commit '
96448307e6a14aa593adb19a0d2ab62a2b96b6ae':
Always check restore against the latest backend metadata
Andrew Lee [Tue, 22 Jul 2014 22:46:50 +0000 (22:46 +0000)]
am
601e5f54: Merge "Revert "Don\'t throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev
* commit '
601e5f546cd5624916beaf274a327ed2538e29ec':
Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."
Christopher Tate [Tue, 22 Jul 2014 22:42:43 +0000 (22:42 +0000)]
am
258e43ce: Merge "Always check restore against the latest backend metadata" into lmp-dev
* commit '
258e43cead6489c4472fa319be49060c5e213b65':
Always check restore against the latest backend metadata
Winson Chung [Tue, 22 Jul 2014 22:32:57 +0000 (22:32 +0000)]
am
9d78363f: am
e07c1cc0: Intermediate refactoring to move towards in-app view transitions.
* commit '
9d78363f8f36d5bd4862c121c8f3b5c05bb1aa6b':
Intermediate refactoring to move towards in-app view transitions.
Winson Chung [Tue, 22 Jul 2014 22:28:47 +0000 (22:28 +0000)]
am
e07c1cc0: Intermediate refactoring to move towards in-app view transitions.
* commit '
e07c1cc0a2315b5ee936e3c9ffe459596ad41bc4':
Intermediate refactoring to move towards in-app view transitions.
Winson Chung [Tue, 22 Jul 2014 19:27:13 +0000 (12:27 -0700)]
Intermediate refactoring to move towards in-app view transitions.
- Fixing bug where we weren't toggling to the right task when using affiliations
- Refactoring task rect calculation to allow full screen task view to be laid out for transitions
- Refactoring the view bounds animations into a separate class
- Refactoring the footer view (for lock-to-task) out of TaskView
- Refactoring some transform code out of TaskView
- Removing fullscreen overlay view
- Fixing case where extra invalidations and layouts were still happening in FixedSizeImageView
- Adding debug overlay to replace specific debug drawing code
Change-Id: Ibf98b6a0782a68cd84582203c807cece1ff3379f
Andrew Lee [Tue, 22 Jul 2014 22:15:26 +0000 (22:15 +0000)]
am
f0e8e160: am
9d8c0b5c: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
* commit '
f0e8e160a774f9e3cb8c2bf6dccdb1e98501b517':
Don't throw RemoteException in public RemoteCallVideoClient APIs.
Jason Long [Tue, 22 Jul 2014 22:15:21 +0000 (22:15 +0000)]
am
91c5480e: am
e3d7fc4b: Merge "Switched Holo to Material for account chooser activities." into lmp-dev
* commit '
91c5480ee6de8f3f740708e71d5be355e2c04266':
Switched Holo to Material for account chooser activities.
Adrian Roos [Tue, 22 Jul 2014 22:15:17 +0000 (22:15 +0000)]
am
70917abe: am
ff3666ad: Kill flashlight when launching the camera from lockscreen
* commit '
70917abeddb096dca993636020c80a1b2085dcc6':
Kill flashlight when launching the camera from lockscreen
Andrew Lee [Tue, 22 Jul 2014 22:08:28 +0000 (22:08 +0000)]
am
9d8c0b5c: Merge "Don\'t throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev
* commit '
9d8c0b5cd7ea662f14aeaf4b54138e840bac7adc':
Don't throw RemoteException in public RemoteCallVideoClient APIs.
Jason Long [Tue, 22 Jul 2014 22:08:25 +0000 (22:08 +0000)]
am
e3d7fc4b: Merge "Switched Holo to Material for account chooser activities." into lmp-dev
* commit '
e3d7fc4b6c485545851b3851e8e6b2abf8b180b3':
Switched Holo to Material for account chooser activities.
Adrian Roos [Tue, 22 Jul 2014 22:08:21 +0000 (22:08 +0000)]
am
ff3666ad: Kill flashlight when launching the camera from lockscreen
* commit '
ff3666adc57d9faad2636a26ed87bbeef7001131':
Kill flashlight when launching the camera from lockscreen
Adrian Roos [Tue, 22 Jul 2014 22:07:20 +0000 (22:07 +0000)]
am
ff704ec8: am
ed9a0c81: QS: Hide flashlight tile if camera is busy
* commit '
ff704ec8a4130e0fba4e9b8e980f34c64486ec54':
QS: Hide flashlight tile if camera is busy
Adrian Roos [Tue, 22 Jul 2014 22:03:16 +0000 (22:03 +0000)]
am
ed9a0c81: QS: Hide flashlight tile if camera is busy
* commit '
ed9a0c819452d4b22d966623fa217e28de815fd6':
QS: Hide flashlight tile if camera is busy
John Spurlock [Tue, 22 Jul 2014 23:39:58 +0000 (23:39 +0000)]
Merge "BatterySaver: Make the bars orange." into lmp-dev
John Spurlock [Tue, 22 Jul 2014 20:15:08 +0000 (16:15 -0400)]
BatterySaver: Make the bars orange.
Bug:
16203820
Change-Id: I85f700d30a90212202626fc10fb289aca7f2b688
Adrian Roos [Tue, 22 Jul 2014 15:18:55 +0000 (17:18 +0200)]
Kill flashlight when launching the camera from lockscreen
Bug:
16357300
Change-Id: I6838ac405bb30047b076c8acb98bd124e8d00fd6
Adrian Roos [Tue, 22 Jul 2014 13:40:59 +0000 (15:40 +0200)]
QS: Hide flashlight tile if camera is busy
Currently behind a flag because the camera API for this not working
correctly yet.
Bug:
16357300
Change-Id: Ib10a2eafb1323fd611f38db03a2e0b4d7aa67db0
Robin Lee [Tue, 22 Jul 2014 21:53:45 +0000 (21:53 +0000)]
am
51533e26: am
96251e35: Stop double-loading device admins
* commit '
51533e265dc5081d70c010d6f17e36f6b72dc8e5':
Stop double-loading device admins
Paul Soulos [Tue, 22 Jul 2014 21:47:25 +0000 (21:47 +0000)]
am
642251ef: am
9d129942: Adds ScrollBounds to the Transition framework
* commit '
642251ef91bf4d593d7ab657df03b00afb2973ac':
Adds ScrollBounds to the Transition framework
Alan Viverette [Tue, 22 Jul 2014 21:47:21 +0000 (21:47 +0000)]
am
62e45ecb: am
d6f1350f: Make toolbarStyle public
* commit '
62e45ecbd12fa6221d8f0dfeb53df1af22409c6f':
Make toolbarStyle public
Robert Ly [Tue, 22 Jul 2014 21:47:17 +0000 (21:47 +0000)]
am
b5bf50b8: am
1c08a2ba: am
c12d7e3a: am
ff428e08: am
c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
* commit '
b5bf50b8995415ce1f205d76dc87aae05b65ba5a':
Doc change: add reminder for developers on using ad id.
David Friedman [Tue, 22 Jul 2014 21:47:13 +0000 (21:47 +0000)]
am
83fc010d: am
0514aba5: am
42dbe809: am
af001f94: am
170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
* commit '
83fc010d0ab693fb1d06f89980ae629894a44ade':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Chris Craik [Tue, 22 Jul 2014 21:47:09 +0000 (21:47 +0000)]
am
c9d4ee79: am
52b2ae22: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev
* commit '
c9d4ee79e73f000987a05d9d27d5eb024e5ba525':
[Bitmap] Add null pointer protection in Bitmap_sameAs()
Alexandra Gherghina [Tue, 22 Jul 2014 21:47:05 +0000 (21:47 +0000)]
am
6ec756fd: am
5f9a77e5: Do Not Merge Per-user API for master sync
* commit '
6ec756fd1503ea88bd1ca031eeef733e2a44bfac':
Do Not Merge Per-user API for master sync
Scott Rowe [Tue, 22 Jul 2014 21:47:01 +0000 (21:47 +0000)]
am
487dd79a: am
d6900ec2: am
6b2f3ee3: am
2a922cb4: am
40b5d8a0: Merge "cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
* commit '
487dd79ab28525a3a3c685dd39f09ab0539757a1':
cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
Igor Murashkin [Tue, 22 Jul 2014 21:46:55 +0000 (21:46 +0000)]
am
f555fe55: am
8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev
* commit '
f555fe554c28bc8f4e094dce502f343d70be4f3e':
camera2: Add legacy available Request/Result/Characteristics keys
Alan Viverette [Tue, 22 Jul 2014 21:46:49 +0000 (21:46 +0000)]
am
11dbd68d: am
290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev
* commit '
11dbd68d68aba1c7f42304544f88fbffe496bb02':
Add popupTheme attr, propagate from ActionBar to ToolBar
Alex Klyubin [Tue, 22 Jul 2014 21:46:43 +0000 (21:46 +0000)]
am
0caaa29e: am
09a76692: Align PSKKeyManager with framework API style.
* commit '
0caaa29e5bf388c929e81ed417637f4fe4df52f8':
Align PSKKeyManager with framework API style.
Robin Lee [Tue, 22 Jul 2014 21:45:56 +0000 (21:45 +0000)]
am
96251e35: Stop double-loading device admins
* commit '
96251e350b75e6ddbe061e891cfb15f54c936b4b':
Stop double-loading device admins
Paul Soulos [Tue, 22 Jul 2014 21:39:52 +0000 (21:39 +0000)]
am
9d129942: Adds ScrollBounds to the Transition framework
* commit '
9d129942f470ccb10096ebd1afe61a4be36419d0':
Adds ScrollBounds to the Transition framework
Alan Viverette [Tue, 22 Jul 2014 21:39:42 +0000 (21:39 +0000)]
am
d6f1350f: Make toolbarStyle public
* commit '
d6f1350fddb45253820fd8c07497186829788f6f':
Make toolbarStyle public
Robert Ly [Tue, 22 Jul 2014 21:39:33 +0000 (21:39 +0000)]
am
1c08a2ba: am
c12d7e3a: am
ff428e08: am
c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
* commit '
1c08a2ba917f732c8f4a18862b331f43d64f1505':
Doc change: add reminder for developers on using ad id.
David Friedman [Tue, 22 Jul 2014 21:39:29 +0000 (21:39 +0000)]
am
0514aba5: am
42dbe809: am
af001f94: am
170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
* commit '
0514aba57216b2388f85822b7a39731cd9a9ee7e':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Chris Craik [Tue, 22 Jul 2014 21:39:26 +0000 (21:39 +0000)]
am
52b2ae22: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev
* commit '
52b2ae22c6e1ede01027c83cad33507cbfceabd9':
[Bitmap] Add null pointer protection in Bitmap_sameAs()
Alexandra Gherghina [Tue, 22 Jul 2014 21:39:14 +0000 (21:39 +0000)]
am
5f9a77e5: Do Not Merge Per-user API for master sync
* commit '
5f9a77e5337c16335abaa586beab900c25014668':
Do Not Merge Per-user API for master sync
Scott Rowe [Tue, 22 Jul 2014 21:39:09 +0000 (21:39 +0000)]
am
d6900ec2: am
6b2f3ee3: am
2a922cb4: am
40b5d8a0: Merge "cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
* commit '
d6900ec2a6603433e50657a7843966c7d10651ea':
cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
Igor Murashkin [Tue, 22 Jul 2014 21:39:05 +0000 (21:39 +0000)]
am
8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev
* commit '
8f9b6d08fe8b8fc7d8ad88bb68989ebb13dd7aae':
camera2: Add legacy available Request/Result/Characteristics keys
Alan Viverette [Tue, 22 Jul 2014 21:38:58 +0000 (21:38 +0000)]
am
290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev
* commit '
290f45f5affaedcc1ad07b531f700e9695e48b3f':
Add popupTheme attr, propagate from ActionBar to ToolBar
Alex Klyubin [Tue, 22 Jul 2014 21:38:54 +0000 (21:38 +0000)]
am
09a76692: Align PSKKeyManager with framework API style.
* commit '
09a766924c6b1066d63348d2b9dcb3dcdc561a94':
Align PSKKeyManager with framework API style.
Robin Lee [Tue, 22 Jul 2014 15:47:40 +0000 (16:47 +0100)]
Stop double-loading device admins
loadSettingsLocked() was being called twice for USER_OWNER at
systemReady(), doubling the number of admin entries at every boot.
Also guards against double-adding admins which appear twice in the
same XML file, favouring more recently-refreshed entries for
backward compatibility.
Previously an application calling in with 'refreshing = true' would
double-insert whatever admin was being refreshed into its user's list
of device admins. This is fixed too.
@bug
16416936
Change-Id: Idd147aa130e6bce7bcc40532f0a7fb07117b3151
Paul Soulos [Tue, 22 Jul 2014 21:10:16 +0000 (14:10 -0700)]
Adds ScrollBounds to the Transition framework
Change-Id: If22ab5162737f2d109e5eaf407a735523a146b7f
Alan Viverette [Tue, 22 Jul 2014 20:09:32 +0000 (13:09 -0700)]
Make toolbarStyle public
BUG:
16486273
Change-Id: I2a9f3dbac536307cdd87ea0c50801c80ae96cd94
Robert Ly [Tue, 22 Jul 2014 21:00:07 +0000 (21:00 +0000)]
am
c12d7e3a: am
ff428e08: am
c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
* commit '
c12d7e3a3dc7b3f8df06f59d7fbeb2da84a1a493':
Doc change: add reminder for developers on using ad id.
David Friedman [Tue, 22 Jul 2014 20:55:55 +0000 (20:55 +0000)]
am
42dbe809: am
af001f94: am
170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
* commit '
42dbe80914b67841c2a8fe93fef8b80e58155684':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Robert Ly [Tue, 22 Jul 2014 20:53:20 +0000 (20:53 +0000)]
am
ff428e08: am
c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
* commit '
ff428e08a5350153c5f9476551930b0eefdfcd06':
Doc change: add reminder for developers on using ad id.
David Friedman [Tue, 22 Jul 2014 20:49:09 +0000 (20:49 +0000)]
am
af001f94: am
170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
* commit '
af001f9410bf0a45282b2f0ab7c4c3bf77645697':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Robert Ly [Tue, 22 Jul 2014 20:49:05 +0000 (20:49 +0000)]
am
c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs
* commit '
c57c08298364e93ca4399d184bdba2657f72b11c':
Doc change: add reminder for developers on using ad id.
David Friedman [Tue, 22 Jul 2014 20:45:11 +0000 (20:45 +0000)]
am
170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs
* commit '
170b09535d21c7c50051e391b8f7a61678872c2b':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
Alexandra Gherghina [Tue, 15 Jul 2014 22:11:48 +0000 (23:11 +0100)]
Do Not Merge Per-user API for master sync
Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit
222aea8bd997807784dc99ca53f63280d384fdf0)
Scott Rowe [Tue, 22 Jul 2014 20:12:08 +0000 (20:12 +0000)]
am
6b2f3ee3: am
2a922cb4: am
40b5d8a0: Merge "cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
* commit '
6b2f3ee3b9954b4b834d6729265acd33ef232b9c':
cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
Scott Rowe [Tue, 22 Jul 2014 20:08:02 +0000 (20:08 +0000)]
am
2a922cb4: am
40b5d8a0: Merge "cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
* commit '
2a922cb45a0cb33ef575e39ac8ca4dc8500e03ba':
cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
Scott Rowe [Tue, 22 Jul 2014 20:03:19 +0000 (20:03 +0000)]
am
40b5d8a0: Merge "cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs
* commit '
40b5d8a0e5aad92c07420541fd186f9f96495845':
cherrypick from klp-docs docs: b/
14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
Alex Klyubin [Mon, 21 Jul 2014 17:09:58 +0000 (10:09 -0700)]
Align PSKKeyManager with framework API style.
This CL adjusts android.net.PSKKeyManager as follows:
* Renamed to PskKeyManager to follow naming conventions.
* Changed from interface to abstract class with default
implementations for all methods.
Bug:
16403305
Bug:
15073623
Change-Id: Iefce26b394d4a753412315dad554b5342f3f0b44
Jason Monk [Tue, 22 Jul 2014 19:43:37 +0000 (19:43 +0000)]
am
4a6da95d: am
d8288538: Merge "Implement hotspot tile" into lmp-dev
* commit '
4a6da95d7b966d77820c56a3c1bd814add177754':
Implement hotspot tile
Jason Monk [Tue, 22 Jul 2014 19:40:00 +0000 (19:40 +0000)]
am
d8288538: Merge "Implement hotspot tile" into lmp-dev
* commit '
d82885384d4de3aed8cebc694c702f1e21d33c0a':
Implement hotspot tile
Andrew Solovay [Tue, 22 Jul 2014 19:31:12 +0000 (19:31 +0000)]
am
c15901e3: am
925ad384: am
0ff1ecd1: (-s ours) am
3968ae0f: am
eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
* commit '
c15901e3d8b08e75e64ffa5f479b5d934ad92a9b':
DO NOT MERGE
Chris Craik [Tue, 22 Jul 2014 19:26:40 +0000 (19:26 +0000)]
am
8040d6fc: (-s ours) am
bfb349e2: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()"
* commit '
8040d6fccbcba760c503ab954b79a5a87b49d7b3':
[Bitmap] Add null pointer protection in Bitmap_sameAs()
Andrew Solovay [Tue, 22 Jul 2014 19:20:25 +0000 (19:20 +0000)]
am
925ad384: am
0ff1ecd1: (-s ours) am
3968ae0f: am
eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
* commit '
925ad384007b488205c690c7ca89713c800f3ff1':
DO NOT MERGE
Eric Laurent [Tue, 22 Jul 2014 19:17:12 +0000 (19:17 +0000)]
am
842b6b83: am
ae61b950: AudioService: wait for init completed to handle media server restart
* commit '
842b6b83f10fdab75d4685ac38578ce4627845ca':
AudioService: wait for init completed to handle media server restart
Andrew Solovay [Tue, 22 Jul 2014 19:15:58 +0000 (19:15 +0000)]
am
0ff1ecd1: (-s ours) am
3968ae0f: am
eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
* commit '
0ff1ecd1ece73db8d758f227db9d965ef9598f3b':
DO NOT MERGE
Chris Craik [Tue, 22 Jul 2014 19:15:43 +0000 (19:15 +0000)]
am
48242d80: am
50a2d633: Merge "[HWUI] Fix invisible views are still shown in popup window"
* commit '
48242d801c8719f458a615b14b31760ae590006e':
[HWUI] Fix invisible views are still shown in popup window
Chris Craik [Tue, 22 Jul 2014 19:15:15 +0000 (19:15 +0000)]
am
bfb349e2: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()"
* commit '
bfb349e2421d5b74701818f6aa486f057b2e5884':
[Bitmap] Add null pointer protection in Bitmap_sameAs()
Eric Laurent [Tue, 22 Jul 2014 19:12:49 +0000 (19:12 +0000)]
am
ae61b950: AudioService: wait for init completed to handle media server restart
* commit '
ae61b950d29a1e2c3237b64513b4b0e6fad77b9b':
AudioService: wait for init completed to handle media server restart
Chris Craik [Tue, 22 Jul 2014 19:11:18 +0000 (19:11 +0000)]
am
50a2d633: Merge "[HWUI] Fix invisible views are still shown in popup window"
* commit '
50a2d6339c7a6ee121c4aa52afc4cc027913f3fc':
[HWUI] Fix invisible views are still shown in popup window
Andrew Solovay [Tue, 22 Jul 2014 19:08:45 +0000 (19:08 +0000)]
am
3968ae0f: am
eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
* commit '
3968ae0f70b01592c40c3e0cd31ca5ead953faa0':
DO NOT MERGE
Andrew Solovay [Tue, 22 Jul 2014 19:02:58 +0000 (19:02 +0000)]
am
eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
* commit '
eb69126c613dfd476fa516df6ae1c2d78e445f0b':
DO NOT MERGE
Andrew Solovay [Tue, 22 Jul 2014 19:02:19 +0000 (19:02 +0000)]
am
aaf871af: am
9bab0bb0: am
3a14c289: am
a2beba70: am
170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit '
aaf871af2c3a8ab2133d989079776e5e09e2823e':
docs: Removed reference to a sample notepad app.
Sreeram Ramachandran [Tue, 22 Jul 2014 18:57:59 +0000 (18:57 +0000)]
am
bae0d23d: am
4463fd65: Merge "Fix WiFi-Direct." into lmp-dev
* commit '
bae0d23df8e1461168e229e170247433a3a3ab38':
Fix WiFi-Direct.
Andrew Solovay [Tue, 22 Jul 2014 18:57:32 +0000 (18:57 +0000)]
am
9bab0bb0: am
3a14c289: am
a2beba70: am
170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit '
9bab0bb067fdf1c2c899b05e0e0e6411153685fc':
docs: Removed reference to a sample notepad app.
Eric Laurent [Mon, 21 Jul 2014 20:10:07 +0000 (13:10 -0700)]
AudioService: wait for init completed to handle media server restart
Bug:
16458506.
Change-Id: I25804e6e7209d52fd5dd6c622cae85d1e7d2317f
Andrew Solovay [Tue, 22 Jul 2014 18:53:11 +0000 (18:53 +0000)]
am
3a14c289: am
a2beba70: am
170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit '
3a14c2890e9821a36399b042261d75ee4dfdf71f':
docs: Removed reference to a sample notepad app.
Sreeram Ramachandran [Tue, 22 Jul 2014 18:49:42 +0000 (18:49 +0000)]
am
4463fd65: Merge "Fix WiFi-Direct." into lmp-dev
* commit '
4463fd6540f152fe2548a67eb5a34489c11b3f31':
Fix WiFi-Direct.
Andrew Solovay [Tue, 22 Jul 2014 18:47:26 +0000 (18:47 +0000)]
am
a2beba70: am
170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit '
a2beba70b947a948c2a12513c8bdda4d403c2fd6':
docs: Removed reference to a sample notepad app.
Andrew Solovay [Tue, 22 Jul 2014 18:41:21 +0000 (18:41 +0000)]
am
170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
* commit '
170556f82bd009cf5a74a53d7ba61221d74d36e9':
docs: Removed reference to a sample notepad app.
Youngsang Cho [Tue, 22 Jul 2014 18:39:30 +0000 (18:39 +0000)]
am
e9098289: am
6e65fe21: Merge "Minor comment change of TvContract.Programs.COLUMN_TITLE" into lmp-dev
* commit '
e909828949473bf22a5c869987651223a55db362':
Minor comment change of TvContract.Programs.COLUMN_TITLE
Youngsang Cho [Tue, 22 Jul 2014 18:34:11 +0000 (18:34 +0000)]
am
6e65fe21: Merge "Minor comment change of TvContract.Programs.COLUMN_TITLE" into lmp-dev
* commit '
6e65fe21827d51ec393b9d1be3f2440379cb215f':
Minor comment change of TvContract.Programs.COLUMN_TITLE
Craig Mautner [Tue, 22 Jul 2014 18:22:10 +0000 (18:22 +0000)]
am
581feb87: am
90ac517c: Create API for launching from recents
* commit '
581feb87f8a0bcfd14b2b28fd9f06f4e162f10b6':
Create API for launching from recents
Craig Mautner [Tue, 22 Jul 2014 18:17:47 +0000 (18:17 +0000)]
am
90ac517c: Create API for launching from recents
* commit '
90ac517c8636ce8cbb0afe2fc03836b23206f72a':
Create API for launching from recents
Craig Mautner [Tue, 22 Jul 2014 18:17:23 +0000 (18:17 +0000)]
am
506d2d2a: am
39225289: Add empty ArrayList check.
* commit '
506d2d2a32bff5813b7c1017145efa30673d6181':
Add empty ArrayList check.
Behdad Esfahbod [Tue, 22 Jul 2014 18:17:18 +0000 (18:17 +0000)]
am
0abd9ade: am
3c8b2dfb: Add android.Paint that inherits SkPaint
* commit '
0abd9ade5a488151c0fffd859f9f670d7f9f8552':
Add android.Paint that inherits SkPaint
Craig Mautner [Mon, 21 Jul 2014 00:48:47 +0000 (17:48 -0700)]
Create API for launching from recents
Relaunch apps from recents using the same uid and package as was used
in the original launch.
Fixes bug
16358208.
Change-Id: I340800bfee79926b197929360d69f1d570bbf1eb
Craig Mautner [Tue, 22 Jul 2014 18:13:24 +0000 (18:13 +0000)]
am
39225289: Add empty ArrayList check.
* commit '
392252897674c303421b9b2051e20d6bd1767c46':
Add empty ArrayList check.
Behdad Esfahbod [Tue, 22 Jul 2014 18:13:20 +0000 (18:13 +0000)]
am
3c8b2dfb: Add android.Paint that inherits SkPaint
* commit '
3c8b2dfb331a492e8e2c8ccaec13e9f736da36ba':
Add android.Paint that inherits SkPaint
Craig Mautner [Tue, 22 Jul 2014 18:08:53 +0000 (11:08 -0700)]
Add empty ArrayList check.
Fixes bug
15768779.
Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd