OSDN Git Service
John Spurlock [Tue, 12 May 2015 20:09:32 +0000 (20:09 +0000)]
am
e66ba473: Merge "Zen: Ringer mode integration fixes." into mnc-dev
* commit '
e66ba4736667afb9ff3b1d3ebc487d024531f2a3':
Zen: Ringer mode integration fixes.
John Spurlock [Tue, 12 May 2015 19:54:47 +0000 (19:54 +0000)]
Merge "Zen: Ringer mode integration fixes." into mnc-dev
Chris Craik [Tue, 12 May 2015 19:48:17 +0000 (19:48 +0000)]
am
6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev
* commit '
6af2857ae0c3bde47e0e4a6abd84f42ee7086291':
Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""
Chris Craik [Tue, 12 May 2015 19:40:25 +0000 (19:40 +0000)]
Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev
Yohei Yukawa [Tue, 12 May 2015 19:27:59 +0000 (19:27 +0000)]
am
f038295e: Merge "Remove obsolete fields from InputMethodManager." into mnc-dev
* commit '
f038295e98846e3e359854b1642b362643bd6053':
Remove obsolete fields from InputMethodManager.
Yohei Yukawa [Tue, 12 May 2015 19:16:30 +0000 (19:16 +0000)]
Merge "Remove obsolete fields from InputMethodManager." into mnc-dev
Dan Sandler [Tue, 12 May 2015 18:57:59 +0000 (18:57 +0000)]
am
dbd90f03: Merge "Tests for Notification object construction and parceling." into mnc-dev
* commit '
dbd90f032971d59bfb8e0fd2964a3ecb0a9843bd':
Tests for Notification object construction and parceling.
Dan Sandler [Tue, 12 May 2015 18:51:02 +0000 (18:51 +0000)]
Merge "Tests for Notification object construction and parceling." into mnc-dev
Jason Monk [Tue, 12 May 2015 18:47:28 +0000 (18:47 +0000)]
am
ba6a72fd: Merge "Fix crash in setup wizard" into mnc-dev
* commit '
ba6a72fd668c5396e2dc903806c915233bed43c7':
Fix crash in setup wizard
John Spurlock [Mon, 11 May 2015 20:00:09 +0000 (16:00 -0400)]
Zen: Ringer mode integration fixes.
- Properly mute media + alarm streams in total silence.
- Allow system components to update the "ringer mode affected"
streams dynamically.
- Improve dumpsys output for ringer mode streams (include names).
- Remember last ringer mode properly when entering dnd via a
volume down (so we can restore it properly when exiting).
Bug:
20854925
Bug:
20950463
Bug:
20756527
Change-Id: I80afc1f639ff802c541020e25ade1b23e9997ef9
Jason Monk [Tue, 12 May 2015 18:37:23 +0000 (18:37 +0000)]
Merge "Fix crash in setup wizard" into mnc-dev
Jason Monk [Tue, 12 May 2015 18:20:25 +0000 (14:20 -0400)]
Fix crash in setup wizard
Clear out any unhandled worker messages before stopping tracking.
Bug:
21048197
Change-Id: I3792215a1e7799bdb93587cd7158c4d5d86de348
Yohei Yukawa [Tue, 12 May 2015 18:11:27 +0000 (11:11 -0700)]
Remove obsolete fields from InputMethodManager.
IMM#mViewTopLeft and IMM#mViewToScreenMatrix are no longer used.
They should have not been removed in
I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef.
Change-Id: Ia685956c8f7dda1143135345ee9a3873705975ef
Rich Slogar [Tue, 12 May 2015 17:59:51 +0000 (17:59 +0000)]
am
389d5ac6: am
353232ec: am
b97afd41: am
a27dd186: am
e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs
* commit '
389d5ac6ac974f171c12eb608eb8a3e2cad120f8':
docs: renderscript using gradle settings
Rich Slogar [Tue, 12 May 2015 17:48:30 +0000 (17:48 +0000)]
am
353232ec: am
b97afd41: am
a27dd186: am
e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs
* commit '
353232ecee06d1828d8628c4e3917e3b428485aa':
docs: renderscript using gradle settings
Wei Jia [Tue, 12 May 2015 17:47:38 +0000 (17:47 +0000)]
am
0cd3881a: Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev
* commit '
0cd3881aafe40a191db1bd6ff1e1723f25bbb6b0':
MediaSync: rename bufferIndex to bufferId.
Olawale Ogunwale [Tue, 12 May 2015 17:47:30 +0000 (17:47 +0000)]
am
e0b2cad0: Merge "Change attribute values per API council." into mnc-dev
* commit '
e0b2cad093760478e59a4aee5a7af43af2789db6':
Change attribute values per API council.
Wale Ogunwale [Tue, 12 May 2015 17:47:25 +0000 (17:47 +0000)]
am
2a857f00: Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev
* commit '
2a857f00110c448d702ffa4ee998dfd78688fa21':
Move visibleBehind activities into stop state when sleeping/powerDown
P.Y. Laligand [Tue, 12 May 2015 17:47:21 +0000 (17:47 +0000)]
am
e6c47686: Merge "DO NOT MERGE - Display mode switches." into mnc-dev
* commit '
e6c47686f62643d3399218eef4728c22358cbcfb':
DO NOT MERGE - Display mode switches.
Doris Liu [Tue, 12 May 2015 17:47:17 +0000 (17:47 +0000)]
am
4b403557: Merge "Avoid setting mCurFrame to -1" into mnc-dev
* commit '
4b403557bca7b622c187c3b06814e2118ec7d985':
Avoid setting mCurFrame to -1
Alex Klyubin [Tue, 12 May 2015 17:47:12 +0000 (17:47 +0000)]
am
03064e25: Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev
* commit '
03064e25b284d7ee99563658c5966ee590f925f6':
Link to magic constants used by AndroidKeyStore API.
Chris Craik [Tue, 12 May 2015 17:28:14 +0000 (10:28 -0700)]
Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""
Fix import
This reverts commit
7ed1431c83286abc83b9e5afc45fbd21ecb777b1.
Change-Id: Id93eba3ed1d47a90384ba20dea6f74d78755792b
Wei Jia [Tue, 12 May 2015 17:43:46 +0000 (17:43 +0000)]
Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev
Olawale Ogunwale [Tue, 12 May 2015 17:43:02 +0000 (17:43 +0000)]
Merge "Change attribute values per API council." into mnc-dev
Wale Ogunwale [Tue, 12 May 2015 17:39:58 +0000 (17:39 +0000)]
Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev
P.Y. Laligand [Tue, 12 May 2015 17:39:55 +0000 (17:39 +0000)]
Merge "DO NOT MERGE - Display mode switches." into mnc-dev
Wei Jia [Tue, 12 May 2015 00:34:46 +0000 (17:34 -0700)]
MediaSync: rename bufferIndex to bufferId.
Bug:
20887706
Change-Id: I98887832bc2211614a19a3718b46d6da100f6c9b
Rich Slogar [Tue, 12 May 2015 17:36:17 +0000 (17:36 +0000)]
am
b97afd41: am
a27dd186: am
e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs
* commit '
b97afd418558fbe5cf37a17302a84a9d907490e6':
docs: renderscript using gradle settings
Christopher Tate [Tue, 12 May 2015 17:33:07 +0000 (17:33 +0000)]
am
54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
* commit '
54415439ca8d286c4efaf975a54fe0cc7872c86b':
Deprecate Context.MODE_MULTI_PROCESS
Chris Craik [Tue, 12 May 2015 17:33:03 +0000 (17:33 +0000)]
am
d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev
* commit '
d2c05188b669256ab9d6024ad5793e0ca891fed0':
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
Doris Liu [Tue, 12 May 2015 17:32:21 +0000 (17:32 +0000)]
Merge "Avoid setting mCurFrame to -1" into mnc-dev
Alex Klyubin [Tue, 12 May 2015 17:32:29 +0000 (17:32 +0000)]
Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev
Christopher Tate [Tue, 12 May 2015 17:28:12 +0000 (17:28 +0000)]
Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
Craig Mautner [Tue, 28 Apr 2015 23:21:06 +0000 (16:21 -0700)]
Change attribute values per API council.
lockTaskModeDefault => default
lockTaskModeNever => never
lockTaskModeIfWhitelisted => if_whitelisted
lockTaskModeAlways => always
Fixes bug
20642190.
Change-Id: I29cc546e12c330df9ec9af3cc91faf0d0f3df3b4
Chris Craik [Tue, 12 May 2015 17:22:33 +0000 (17:22 +0000)]
Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev
Chris Craik [Tue, 12 May 2015 17:22:22 +0000 (17:22 +0000)]
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
This reverts commit
dfe0a66ceca530e0777ebfab20f81103baa18f14.
Change-Id: I58a1bae649a284f3d3b6213064d903ea7fcf185a
Rich Slogar [Tue, 12 May 2015 17:20:10 +0000 (17:20 +0000)]
am
a27dd186: am
e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs
* commit '
a27dd186b265b58eae490d4e19ec11268ea54f12':
docs: renderscript using gradle settings
Alex Klyubin [Tue, 12 May 2015 17:18:59 +0000 (17:18 +0000)]
am
15a7bb20: Merge "Move PointFormat constants into parent class." into mnc-dev
* commit '
15a7bb202d06bf73f4783d3aaa3d284ba84e08d1':
Move PointFormat constants into parent class.
Chris Craik [Tue, 12 May 2015 17:18:55 +0000 (17:18 +0000)]
am
fd41cf0c: Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev
* commit '
fd41cf0cfc3d460606fbc176703e97fd8346a868':
Revert "Use default constructor to get anti-aliasing"
Alex Klyubin [Tue, 12 May 2015 17:12:18 +0000 (17:12 +0000)]
Merge "Move PointFormat constants into parent class." into mnc-dev
Alex Klyubin [Tue, 12 May 2015 17:05:53 +0000 (10:05 -0700)]
Move PointFormat constants into parent class.
This gets rid of EcIesParameterSpec.PointFormat by moving the
constants into EcIesParameterSpec, prefixed with POINT_FORMAT_.
Bug:
21039983
Change-Id: I7a76bb84e0394db9c7f5b0d53526915d5bbdd511
Doris Liu [Mon, 11 May 2015 22:18:45 +0000 (15:18 -0700)]
Avoid setting mCurFrame to -1
Use the dedicated flag mRunning to check whether the DrawableAnimation
is running, rather than comparing mCurFrame with -1. This CL aims to
simplify the use of mCurFrame.
Bug:
17112962
Change-Id: I15f9e4c102f504b8c806f029949fe9ec872479a5
Chris Craik [Tue, 12 May 2015 17:07:24 +0000 (17:07 +0000)]
Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev
Rich Slogar [Tue, 12 May 2015 17:05:40 +0000 (17:05 +0000)]
am
e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs
* commit '
e78f136b1dbe11dc98c5699da24df49fd9dae795':
docs: renderscript using gradle settings
Alex Klyubin [Tue, 12 May 2015 16:59:30 +0000 (16:59 +0000)]
am
56b96da7: Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev
* commit '
56b96da7e1f1825267662df762609c198a8c41d6':
Hide @IntDef and @StringDef annotations from AnroidKeyStore API.
Olawale Ogunwale [Tue, 12 May 2015 16:59:25 +0000 (16:59 +0000)]
am
3d8c6781: Merge "Don\'t apply animation clip to dialog activities" into mnc-dev
* commit '
3d8c678136ed34e2573a46123681e6a647e5537d':
Don't apply animation clip to dialog activities
Alex Klyubin [Tue, 12 May 2015 16:56:10 +0000 (16:56 +0000)]
Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev
Rich Slogar [Tue, 12 May 2015 16:54:37 +0000 (16:54 +0000)]
Merge "docs: renderscript using gradle settings" into lmp-docs
Olawale Ogunwale [Tue, 12 May 2015 16:51:02 +0000 (16:51 +0000)]
Merge "Don't apply animation clip to dialog activities" into mnc-dev
Chris Craik [Tue, 12 May 2015 16:50:52 +0000 (16:50 +0000)]
am
dc9230b1: Merge "Shrink default path cache size" into mnc-dev
* commit '
dc9230b14ed86f5f5bc3b745242d7521828a924e':
Shrink default path cache size
Paul Jensen [Tue, 12 May 2015 16:41:50 +0000 (16:41 +0000)]
am
356a2612: Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it\'s unneeded." into mnc-dev
* commit '
356a26122bf928709d88cdc9a4a304b4495b1b31':
Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.
Chris Craik [Tue, 12 May 2015 16:39:33 +0000 (16:39 +0000)]
Merge "Shrink default path cache size" into mnc-dev
Chris Craik [Tue, 12 May 2015 16:36:28 +0000 (16:36 +0000)]
Revert "Use default constructor to get anti-aliasing"
bug:
20948129
This reverts commit
58fc522a69e8ddf9ac8530ce88e9c2c92da1dd14.
Change-Id: Iddeccb4ad15b843bb3e610bd3673a0c7abc1bf46
Paul Jensen [Tue, 12 May 2015 16:32:28 +0000 (16:32 +0000)]
Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded." into mnc-dev
Alex Klyubin [Mon, 11 May 2015 19:48:27 +0000 (12:48 -0700)]
Hide @IntDef and @StringDef annotations from AnroidKeyStore API.
By convention, these annotation classes should remain hidden API.
Bug:
18088752
Bug:
21039983
Change-Id: Ifb5d2910c7dae4e0fd809876eb641f1aaf7a00a6
Christopher Tate [Tue, 12 May 2015 16:28:29 +0000 (16:28 +0000)]
am
c7374318: am
7a4cfa58: am
960cb481: am
613626b7: am
afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
* commit '
c7374318a69d4341235bd143b9fdae2cabcea3e9':
During early boot, send LOCALE_CHANGED only to registered receivers
Christopher Tate [Tue, 12 May 2015 16:17:47 +0000 (16:17 +0000)]
am
7a4cfa58: am
960cb481: am
613626b7: am
afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
* commit '
7a4cfa58b1421f95266acc4f6a1683804726a0e0':
During early boot, send LOCALE_CHANGED only to registered receivers
Andre Eisenbach [Tue, 12 May 2015 16:11:26 +0000 (16:11 +0000)]
am
14dcb5f1: Bluetooth native dumpsys logging support (3/5)
* commit '
14dcb5f13852619e68a22446ee37510191718c3a':
Bluetooth native dumpsys logging support (3/5)
Christopher Tate [Tue, 12 May 2015 16:06:43 +0000 (16:06 +0000)]
am
960cb481: am
613626b7: am
afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
* commit '
960cb4816c082eee52a221052a8e4232f0c0fb14':
During early boot, send LOCALE_CHANGED only to registered receivers
Chris Craik [Tue, 12 May 2015 15:57:43 +0000 (15:57 +0000)]
am
bf9c5c13: Merge "Remove usage of Texture::cleanup in PathCache" into mnc-dev
* commit '
bf9c5c13cd24350e85f534d2348c1dd4ba8a33df':
Remove usage of Texture::cleanup in PathCache
Andre Eisenbach [Fri, 5 Dec 2014 17:31:30 +0000 (09:31 -0800)]
Bluetooth native dumpsys logging support (3/5)
Bug:
18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
Christopher Tate [Tue, 12 May 2015 15:53:04 +0000 (15:53 +0000)]
am
613626b7: am
afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
* commit '
613626b7488c5c35a4816804fbe8f837a7e30440':
During early boot, send LOCALE_CHANGED only to registered receivers
Chris Craik [Tue, 12 May 2015 15:48:54 +0000 (15:48 +0000)]
Merge "Remove usage of Texture::cleanup in PathCache" into mnc-dev
Christopher Tate [Tue, 12 May 2015 15:39:12 +0000 (15:39 +0000)]
am
afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
* commit '
afd883f8a3ee260a5505f83d628c0b789871c837':
During early boot, send LOCALE_CHANGED only to registered receivers
Jason Monk [Tue, 12 May 2015 15:14:30 +0000 (15:14 +0000)]
am
e74d5d09: Merge "Add SysUI Tuner" into mnc-dev
* commit '
e74d5d09e1749b128437ff340b43278857139338':
Add SysUI Tuner
Jason Monk [Tue, 12 May 2015 15:03:40 +0000 (15:03 +0000)]
Merge "Add SysUI Tuner" into mnc-dev
Jason Monk [Mon, 11 May 2015 20:57:15 +0000 (16:57 -0400)]
Add SysUI Tuner
Change-Id: I9b0fabbe913b8297d8c668b6416a7be856adb9d5
Jason Monk [Tue, 12 May 2015 14:44:45 +0000 (14:44 +0000)]
am
2df11817: Merge "Add control for double tap to wake setting" into mnc-dev
* commit '
2df11817b2a84dd3d0a6635d9d9e526688a6e215':
Add control for double tap to wake setting
Paul Jensen [Wed, 6 May 2015 14:42:25 +0000 (10:42 -0400)]
Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.
All ConnectivityManager APIs taking a network type have been
deprecated so there should be no need to validate a network type.
bug:
20647016
Change-Id: I2dcf24f58016e94aa814dda38cfc848366cc461c
Jason Monk [Tue, 12 May 2015 14:35:12 +0000 (14:35 +0000)]
Merge "Add control for double tap to wake setting" into mnc-dev
John Reck [Tue, 12 May 2015 14:28:20 +0000 (14:28 +0000)]
am
4bd4121d: Merge "Increase HISTORY_SIZE for GraphicsStatsService" into mnc-dev
* commit '
4bd4121d584e16c700ba08828c675b7f906ff331':
Increase HISTORY_SIZE for GraphicsStatsService
John Reck [Tue, 12 May 2015 14:21:38 +0000 (14:21 +0000)]
Merge "Increase HISTORY_SIZE for GraphicsStatsService" into mnc-dev
Jason Monk [Tue, 31 Mar 2015 20:46:39 +0000 (16:46 -0400)]
Add control for double tap to wake setting
Bug:
16875464
Change-Id: Ic1ad910dd38acbc68ef040b2acdf3696ec2c2e4e
Amith Yamasani [Tue, 12 May 2015 13:16:09 +0000 (13:16 +0000)]
am
bb9d9278: Merge "Idle timebase" into mnc-dev
* commit '
bb9d9278aa6fe3ba3d4c21b03d3e3da4543a974c':
Idle timebase
Amith Yamasani [Tue, 12 May 2015 13:04:29 +0000 (13:04 +0000)]
Merge "Idle timebase" into mnc-dev
Michael Wright [Tue, 12 May 2015 12:24:24 +0000 (12:24 +0000)]
am
6959865f: Merge "Remove SLEEP and POWER from wake key list." into mnc-dev
* commit '
6959865fb0de965b5a2c7a797bf26b8bf9d10228':
Remove SLEEP and POWER from wake key list.
Michael Wright [Tue, 12 May 2015 12:12:47 +0000 (12:12 +0000)]
Merge "Remove SLEEP and POWER from wake key list." into mnc-dev
Narayan Kamath [Tue, 12 May 2015 10:49:19 +0000 (10:49 +0000)]
am
5a7587fa: Fix file descriptor leak when opening invalid archives.
* commit '
5a7587fa90732c013bb9266f1bdae0a557455c15':
Fix file descriptor leak when opening invalid archives.
Narayan Kamath [Mon, 11 May 2015 14:45:36 +0000 (15:45 +0100)]
Fix file descriptor leak when opening invalid archives.
I've inspected all other callers of OpenArchive and this seems
to be the only broken one. The easiest way to reproduce this is
by using getPackageArchiveInfo or by adding an asset path that
isn't a valid APK.
bug: https://code.google.com/p/android/issues/detail?id=171099
Change-Id: I41cd85d20f26ad47968e2a6f1384cc03330b558b
Ricky Wai [Tue, 12 May 2015 09:46:38 +0000 (09:46 +0000)]
am
227d42db: Merge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into mnc-dev
* commit '
227d42db5bd1bd16b6101f799052c10f4f493647':
Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon
Ricky Wai [Tue, 12 May 2015 09:35:59 +0000 (09:35 +0000)]
Merge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into mnc-dev
Rubin Xu [Tue, 12 May 2015 09:35:02 +0000 (09:35 +0000)]
am
9fc8bb63: Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev
* commit '
9fc8bb63d8c15ecfcd3a72a685eaec6c8ec0aa6e':
Tweak SystemUpdatePolicy according to API review.
Clara Bayarri [Tue, 12 May 2015 09:34:57 +0000 (09:34 +0000)]
am
c12e4e46: Merge "Fix Floating toolbar is not refreshed when dragging insertion handle" into mnc-dev
* commit '
c12e4e468fa8c72875632b11b96b2f67ea98d7c0':
Fix Floating toolbar is not refreshed when dragging insertion handle
Rubin Xu [Tue, 12 May 2015 09:06:09 +0000 (09:06 +0000)]
Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev
Clara Bayarri [Tue, 12 May 2015 09:06:04 +0000 (09:06 +0000)]
Merge "Fix Floating toolbar is not refreshed when dragging insertion handle" into mnc-dev
Jae Seo [Tue, 12 May 2015 05:32:21 +0000 (05:32 +0000)]
am
8ef4a3c9: Merge "TIF: Rename requestUnblockContent to unblockContent" into mnc-dev
* commit '
8ef4a3c9c0dd60bf8b0c959123d0afe1a62a153e':
TIF: Rename requestUnblockContent to unblockContent
Jae Seo [Tue, 12 May 2015 05:21:26 +0000 (05:21 +0000)]
Merge "TIF: Rename requestUnblockContent to unblockContent" into mnc-dev
Jae Seo [Thu, 12 Mar 2015 02:29:46 +0000 (19:29 -0700)]
TIF: Rename requestUnblockContent to unblockContent
The method TvView.requestUnblockContent doesn't match the name of the
corresponding method in TvInputService, onUnblockContent, hence changed
the name to make it consistent with the current naming scheme.
This change deprecated the requestUnblockContent method as the first
step.
Bug:
19337627
Change-Id: I530209c4dca66305da90ffded7199fa3c1c1780c
Dongwon Kang [Tue, 12 May 2015 05:02:15 +0000 (05:02 +0000)]
am
b9e26621: Merge "TIF: add more documentation on Session.setOverlayViewEnabled()." into mnc-dev
* commit '
b9e26621ba46580c9208fde94260666558f81ab9':
TIF: add more documentation on Session.setOverlayViewEnabled().
Dongwon Kang [Tue, 12 May 2015 04:51:07 +0000 (04:51 +0000)]
Merge "TIF: add more documentation on Session.setOverlayViewEnabled()." into mnc-dev
Jae Seo [Tue, 12 May 2015 04:50:15 +0000 (04:50 +0000)]
am
cf1b4c77: Merge "TIF: Unhide the surface layout API" into mnc-dev
* commit '
cf1b4c77de26f0d3c0d8a9a037d43d49bd016540':
TIF: Unhide the surface layout API
Jae Seo [Tue, 12 May 2015 04:43:06 +0000 (04:43 +0000)]
Merge "TIF: Unhide the surface layout API" into mnc-dev
Joe Fernandez [Tue, 12 May 2015 04:33:10 +0000 (04:33 +0000)]
am
57881dcf: am
f3c04204: am
13e39e3f: am
c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
* commit '
57881dcfb152e7c4e1a081cc3e1d62ff51d82ab0':
docs: studio 1.2.1.1 updates
Jeff Hao [Tue, 12 May 2015 04:33:06 +0000 (04:33 +0000)]
am
bff52394: am
3da32f77: am
b1e9430a: am
c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.
* commit '
bff523940fe466d7666246c49f47d20eed67f1e0':
Fix prototype for startMethodTracingSampling in profiling docs.
Jae Seo [Thu, 23 Apr 2015 20:19:15 +0000 (13:19 -0700)]
TIF: Unhide the surface layout API
Also fixed some comments to make them more consistent with now public
API.
Bug:
20254168
Change-Id: I62fcdace742603ffd3756c5188c8cf37ccf964ba
Joe Fernandez [Tue, 12 May 2015 04:24:53 +0000 (04:24 +0000)]
am
f3c04204: am
13e39e3f: am
c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
* commit '
f3c042045f70b74d700c3d96429f45b93606e56b':
docs: studio 1.2.1.1 updates
Jeff Hao [Tue, 12 May 2015 04:24:46 +0000 (04:24 +0000)]
am
3da32f77: am
b1e9430a: am
c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.
* commit '
3da32f77fb99a21c35cfc914641e34b949c2d623':
Fix prototype for startMethodTracingSampling in profiling docs.
Joe Fernandez [Tue, 12 May 2015 04:09:42 +0000 (04:09 +0000)]
am
13e39e3f: am
c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
* commit '
13e39e3fd28544ff13639938455a8b7d593b835b':
docs: studio 1.2.1.1 updates
Jeff Hao [Tue, 12 May 2015 04:09:38 +0000 (04:09 +0000)]
am
b1e9430a: am
c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.
* commit '
b1e9430a9d653937ae9ee2ae9c3e60860b30ba4d':
Fix prototype for startMethodTracingSampling in profiling docs.
Joe Fernandez [Tue, 12 May 2015 04:00:31 +0000 (04:00 +0000)]
am
c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
* commit '
c1e973477d635e08ab656bba3dbaf73927feaae8':
docs: studio 1.2.1.1 updates