OSDN Git Service
Daichi Hirono [Wed, 30 Mar 2016 00:32:43 +0000 (00:32 +0000)]
Merge "Use AppFuse to write document." into nyc-dev
am:
c124427
* commit '
c124427880cf51e27185cd525ec332f4ad312c34':
Use AppFuse to write document.
Change-Id: I36769d0ec7fbe73f4eb3aec66513a2806c1b5c5e
Siyamed Sinir [Wed, 30 Mar 2016 00:22:08 +0000 (00:22 +0000)]
Merge "Revert "TextView setText/append methods set movement method"" into nyc-dev
am:
d225f87
* commit '
d225f87ebc55333c3d40295d1977ce8ac4a59c2d':
Revert "TextView setText/append methods set movement method"
Change-Id: I29b1a0d197dc2df861d5e55eb91ba17410c42664
Miao Wang [Wed, 30 Mar 2016 00:22:07 +0000 (00:22 +0000)]
Merge "[RenderScript] Fix IntrinsicConvolve documentation." into nyc-dev
am:
2d92afb
* commit '
2d92afbef78098076eb0d9efd8c5cf4a6e8d0542':
[RenderScript] Fix IntrinsicConvolve documentation.
Change-Id: Ia3c8f26550801b17e816f7b86b5561161c10f2d5
Miao Wang [Wed, 30 Mar 2016 00:22:05 +0000 (00:22 +0000)]
Merge "[RenderScript] Update the documentation of Script.LaunchOptions" into nyc-dev
am:
44fa908
* commit '
44fa90868cb15fc0ab85b48d6a4ac22d568e9e88':
[RenderScript] Update the documentation of Script.LaunchOptions
Change-Id: I8c48a7b50c111e6ffe62b17f900e4fe579a25c56
Robert Carr [Wed, 30 Mar 2016 00:22:03 +0000 (00:22 +0000)]
Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev
am:
ffe3098
* commit '
ffe309816989457f71a39a84d22fb06fe5b6e8d5':
Ensure we change SurfaceView size from UI thread.
Change-Id: I8e57aa126a601df935b6005b74ba7842f819c741
Jeff Sharkey [Wed, 30 Mar 2016 00:22:00 +0000 (00:22 +0000)]
Merge "AccessibilityNodeInfo shouldn\'t touch extras." into nyc-dev
am:
af64f63
* commit '
af64f6341bdbca93aff3d68264af48e74faa9e58':
AccessibilityNodeInfo shouldn't touch extras.
Change-Id: I44ae8aebdbe0046a64971eb47c25b8720f7bfd36
Makoto Onuki [Wed, 30 Mar 2016 00:21:57 +0000 (00:21 +0000)]
Merge "ShortcutManager: proper work profile support" into nyc-dev
am:
d5b745a
* commit '
d5b745a9e64734483bc43c781ad809b2a75bd1ba':
ShortcutManager: proper work profile support
Change-Id: Ic31214205a5a93e37e5585829ae522bf4890b519
Daichi Hirono [Wed, 30 Mar 2016 00:20:38 +0000 (00:20 +0000)]
Merge "Use AppFuse to write document." into nyc-dev
Siyamed Sinir [Tue, 29 Mar 2016 23:59:13 +0000 (23:59 +0000)]
Merge "Revert "TextView setText/append methods set movement method"" into nyc-dev
Miao Wang [Tue, 29 Mar 2016 23:55:42 +0000 (23:55 +0000)]
Merge "[RenderScript] Fix IntrinsicConvolve documentation." into nyc-dev
Miao Wang [Tue, 29 Mar 2016 23:55:25 +0000 (23:55 +0000)]
Merge "[RenderScript] Update the documentation of Script.LaunchOptions" into nyc-dev
Rob Carr [Tue, 29 Mar 2016 23:50:45 +0000 (23:50 +0000)]
Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev
zhangshuxiao [Tue, 29 Mar 2016 22:51:07 +0000 (22:51 +0000)]
Merge "When wifi ssid is empty, return WifiSsid.NONE" am:
4af5c34
am:
eef758c
* commit '
eef758cb01df94642ddf1a50ccc434b4a4b343fc':
When wifi ssid is empty, return WifiSsid.NONE
Change-Id: I179f5641cf98fdce947c4f61a2dd1d52595952b4
Jeff Sharkey [Tue, 29 Mar 2016 22:47:16 +0000 (22:47 +0000)]
Merge "AccessibilityNodeInfo shouldn't touch extras." into nyc-dev
zhangshuxiao [Tue, 29 Mar 2016 22:47:04 +0000 (22:47 +0000)]
Merge "When wifi ssid is empty, return WifiSsid.NONE"
am:
4af5c34
* commit '
4af5c34a78ab65c22fa931bd9167f18b9211fd99':
When wifi ssid is empty, return WifiSsid.NONE
Change-Id: I800fb4daf9773fff697e6cb3ac0c6734085248d8
Makoto Onuki [Tue, 29 Mar 2016 22:45:01 +0000 (22:45 +0000)]
Merge "ShortcutManager: proper work profile support" into nyc-dev
Robert Greenwalt [Tue, 29 Mar 2016 22:39:53 +0000 (22:39 +0000)]
Merge "When wifi ssid is empty, return WifiSsid.NONE"
Jeff Sharkey [Tue, 29 Mar 2016 22:37:14 +0000 (16:37 -0600)]
AccessibilityNodeInfo shouldn't touch extras.
The extras may contain custom Parcelables which aren't in the
system's default classpath, so touching them would end up clobbering
the contents.
Update code to leave the parcelled data untouched inside the bundle
until someone tries reading the extras.
Bug:
27897919
Change-Id: I99381dd50c9a0e8887667076362ea98805f0437c
Teng-Hui Zhu [Tue, 29 Mar 2016 22:31:34 +0000 (22:31 +0000)]
Merge "Add test for AVD on SW Layer" into nyc-dev
am:
5eea9af
* commit '
5eea9afe44d7e1d38284c633b15113441411f454':
Add test for AVD on SW Layer
Change-Id: Id6932e2d74f08f42997ed0cb0b6ebb508df164c0
Miao Wang [Tue, 29 Mar 2016 22:29:10 +0000 (15:29 -0700)]
[RenderScript] Fix IntrinsicConvolve documentation.
Bug:
25117120
- Better format.
- Typo fixes.
Change-Id: Ic6f8d1dacecdaf9993dd8298de7a801f5fd2a937
Tenghui Zhu [Tue, 29 Mar 2016 22:25:17 +0000 (22:25 +0000)]
Merge "Add test for AVD on SW Layer" into nyc-dev
Adam Powell [Tue, 29 Mar 2016 22:19:21 +0000 (22:19 +0000)]
Merge "Add contentInsetStartWithNavigation/EndWithActions" into nyc-dev
am:
b3eca31
* commit '
b3eca3161d78f4ed5d5466de3d9ee59af6e271af':
Add contentInsetStartWithNavigation/EndWithActions
Change-Id: Icfcd1296131ed26c97d766ccad230a59900d4b97
Miao Wang [Tue, 29 Mar 2016 22:14:21 +0000 (15:14 -0700)]
[RenderScript] Update the documentation of Script.LaunchOptions
Bug:
26916665
- Add description of the endArg.
- Update the example.
- Update the incorrect description.
Change-Id: Idd07db5d790e2d6462fff9cb580115ec45cfd4f0
Jeff Sharkey [Tue, 29 Mar 2016 22:13:28 +0000 (22:13 +0000)]
Merge "Delay vold connectors until published, fix NPE." into nyc-dev
am:
d974605
* commit '
d974605c733d5121a0415edefac27e17c2a36dcd':
Delay vold connectors until published, fix NPE.
Change-Id: Id0d978eb023635b27d3edfae2a6699b5955be7bc
Adam Powell [Tue, 29 Mar 2016 22:12:32 +0000 (22:12 +0000)]
Merge "Add contentInsetStartWithNavigation/EndWithActions" into nyc-dev
Jeff Sharkey [Tue, 29 Mar 2016 22:04:54 +0000 (22:04 +0000)]
Merge "Delay vold connectors until published, fix NPE." into nyc-dev
Suprabh Shukla [Tue, 29 Mar 2016 21:58:08 +0000 (21:58 +0000)]
Merge "Removing unused intent extra" into nyc-dev
am:
7a3bff1
* commit '
7a3bff184731912ddcf3c88da1a6c58c956e01f2':
Removing unused intent extra
Change-Id: I28eedcdb71c0241bcc0f2227a554d499ef7350b8
Dmitri Plotnikov [Tue, 29 Mar 2016 21:58:06 +0000 (21:58 +0000)]
Merge "Allowing AppWidgetService to start without FEATURE_APP_WIDGETS" into nyc-dev
am:
a8213ee
* commit '
a8213eebddb05ea714d0af90a7a7f42e3799a2c1':
Allowing AppWidgetService to start without FEATURE_APP_WIDGETS
Change-Id: Ia141a88c1da99143fd3d123625168763091ab69a
Jeff Sharkey [Tue, 29 Mar 2016 20:12:49 +0000 (14:12 -0600)]
Delay vold connectors until published, fix NPE.
If they connect too quickly, PackageManager could end up trying to
obtain the yet-unpublished MountService.
Fix NPE in UserManagerService when trying to persist fingerprints,
and fix write ordering to always write [id].xml before userlist.xml
to avoid battery pull issues. Simlarly, delete [id].xml only after
updating userlist.xml.
Bug:
27869443
Change-Id: I43d8552e5e37b9ca4137cca3e3e76684c7dee605
Chris Craik [Tue, 29 Mar 2016 21:49:21 +0000 (21:49 +0000)]
Merge "Overdraw avoidance in new pipeline" into nyc-dev
am:
80a67f3
* commit '
80a67f363f6ae941c28572ea8420c14c2ce6ef79':
Overdraw avoidance in new pipeline
Change-Id: I139d5172d2913ecce6f8ab91d5f5b5f34988039a
Suprabh Shukla [Tue, 29 Mar 2016 21:48:36 +0000 (21:48 +0000)]
Merge "Removing unused intent extra" into nyc-dev
Dmitri Plotnikov [Tue, 29 Mar 2016 21:46:27 +0000 (21:46 +0000)]
Merge "Allowing AppWidgetService to start without FEATURE_APP_WIDGETS" into nyc-dev
Siyamed Sinir [Tue, 29 Mar 2016 21:30:01 +0000 (21:30 +0000)]
Revert "TextView setText/append methods set movement method"
This reverts commit
4ba0aa598ea86b7cffab8cd6ccd007e4e29cf883.
Change-Id: I7d6eb2584a1348014ce9c3fc3e53b4cf96e30db1
Oren Blasberg [Tue, 29 Mar 2016 21:43:18 +0000 (21:43 +0000)]
Merge "Call the onDismiss listener in submenus." into nyc-dev
am:
d86fd61
* commit '
d86fd61cd865b4515760d48f9137ad80c7b23e97':
Call the onDismiss listener in submenus.
Change-Id: If8719d69715d83ab48809c119a4f75b4fa249201
Makoto Onuki [Tue, 29 Mar 2016 18:14:42 +0000 (11:14 -0700)]
ShortcutManager: proper work profile support
Bug
27548047
Change-Id: I8acea3355f8974a551f53814624dec30732f7b2f
Chris Craik [Tue, 29 Mar 2016 21:41:50 +0000 (21:41 +0000)]
Merge "Overdraw avoidance in new pipeline" into nyc-dev
Andreas Gampe [Tue, 29 Mar 2016 21:39:59 +0000 (21:39 +0000)]
Merge "Frameworks/base: Refactor package manager" am:
453a77c
am:
46fd870 -s ours
* commit '
46fd870e5e5645ca8a1ad306f5df50d8b2ca7d63':
Frameworks/base: Refactor package manager
Change-Id: Ibfb2544b642ad38f1948d331a1c368d67a5c4914
Oren Blasberg [Tue, 29 Mar 2016 21:34:45 +0000 (21:34 +0000)]
Merge "Call the onDismiss listener in submenus." into nyc-dev
Andreas Gampe [Tue, 29 Mar 2016 21:33:36 +0000 (21:33 +0000)]
Merge "Frameworks/base: Refactor package manager"
am:
453a77c
* commit '
453a77c702f0c857b4900aeb5772e37d0a309b1f':
Frameworks/base: Refactor package manager
Change-Id: Ia8003f32edfa9cb22e4e2378c2b733a736cb8da1
Andreas Gampe [Tue, 29 Mar 2016 21:24:18 +0000 (21:24 +0000)]
Merge "Frameworks/base: Refactor package manager"
Adam Powell [Mon, 28 Mar 2016 16:38:41 +0000 (09:38 -0700)]
Add contentInsetStartWithNavigation/EndWithActions
Allow developers to set different content insets on toolbars and
action bars to be used when navigation buttons or menu actions are
present. Set the default values for these according to the material
spec.
Bug
19317855
Change-Id: I13e04e1f19f0982bf551a3027eb70904d6b4674c
Chong Zhang [Tue, 29 Mar 2016 21:15:33 +0000 (21:15 +0000)]
Merge "Animate IME adjustment for docked stack through the divider" into nyc-dev
am:
4c78ba6
* commit '
4c78ba65435326987e2901f3384b81836149b299':
Animate IME adjustment for docked stack through the divider
Change-Id: I0e45119c1d3eabf3d680090fc9235bae84285a34
Chong Zhang [Tue, 29 Mar 2016 21:07:54 +0000 (21:07 +0000)]
Merge "Animate IME adjustment for docked stack through the divider" into nyc-dev
Oren Blasberg [Tue, 29 Mar 2016 21:00:29 +0000 (21:00 +0000)]
Merge "Make context menu titles a nicer color." into nyc-dev
am:
77f30cc
* commit '
77f30ccc7cb8bb4c7c3463ae41d7d60da851a79d':
Make context menu titles a nicer color.
Change-Id: I017a788c684f936c400ccf9300fb65c7bc52ab0a
Oren Blasberg [Tue, 29 Mar 2016 20:56:02 +0000 (20:56 +0000)]
Merge "Make context menu titles a nicer color." into nyc-dev
Alan Viverette [Tue, 29 Mar 2016 20:43:33 +0000 (20:43 +0000)]
Merge "Always use existing PopupWindow dimension if not otherwise specified" into nyc-dev
am:
11c0415
* commit '
11c041576d3d3ea2059387ac7be89c561467b0ef':
Always use existing PopupWindow dimension if not otherwise specified
Change-Id: Id3a4f82e97a1f2e770340fcde2c7010159230bf9
Michal Karpinski [Tue, 29 Mar 2016 20:43:31 +0000 (20:43 +0000)]
Merge "Moving app process logging from AMS to PMS" into nyc-dev
am:
5393784
* commit '
53937849fcb4f2e33072997bd8a7cee40137495c':
Moving app process logging from AMS to PMS
Change-Id: Ief43c8c50770fff78ec198b2b1a03165fcc3e60d
Robert Carr [Tue, 29 Mar 2016 20:15:41 +0000 (13:15 -0700)]
Ensure we change SurfaceView size from UI thread.
We need to change the SurfaceView size from the UI thread
so that we can appropriately deliver the SurfaceChanged
callback. We also need to not preserve geometry
in this case, as if we don't update the surface
and layout size together we could get scaling. This still has
some potential for holes, as transactions are not synced with
the parent renderer, but we have other methods to avoid
these in the case of resizing. This fixes the remaining
issues with content sizing and surface view "out of sync".
Bug:
27780983
Bug:
27687126
Bug:
27676101
Change-Id: Idd7864f00e5cf7a4eb32dd66c0b389292a788069
Muyuan Li [Tue, 29 Mar 2016 20:36:53 +0000 (20:36 +0000)]
Merge "sysui: refactor for extensibility" into nyc-dev
am:
415ebdb
* commit '
415ebdb88027a4885f6ff95b3dfb7466144dc0e4':
sysui: refactor for extensibility
Change-Id: Ifc0db571e1b9fbe3d8d66d0303d59ec16bc3c29b
Muyuan Li [Tue, 29 Mar 2016 20:36:51 +0000 (20:36 +0000)]
sysui: refactor for extension
am:
8303bd2
* commit '
8303bd2b17eb33dcecf2ef63d1aee87f7427f812':
sysui: refactor for extension
Change-Id: I36c051818c1f251b8c244e91ef2351d577b9f688
Alan Viverette [Tue, 29 Mar 2016 20:35:58 +0000 (20:35 +0000)]
Merge "Always use existing PopupWindow dimension if not otherwise specified" into nyc-dev
Michal Karpinski [Tue, 29 Mar 2016 20:35:45 +0000 (20:35 +0000)]
Merge "Moving app process logging from AMS to PMS" into nyc-dev
Oren Blasberg [Mon, 28 Mar 2016 19:13:49 +0000 (12:13 -0700)]
Call the onDismiss listener in submenus.
For StandardMenuPopup, if user opens a submenu, the ondismiss listener is no
longer called. Instead, it is called when the submenu (which is now open in
the top level menu's place) is dismissed.
Bug:
27877103
Change-Id: I069388fd173142620c667fa8d1cb21e88d5266fe
Chris Craik [Mon, 28 Mar 2016 19:54:07 +0000 (12:54 -0700)]
Overdraw avoidance in new pipeline
bug:
27873093
Adds the simple overdraw avoidance optimization to the new
pipeline. This means when LayerBuilder defers draws that are opaque over
the full area of the repaint region, it will discard all drawing content
beneth.
Also moves a lot of complexity out of BakedOpState's header.
Change-Id: Iffca6d8e1b170ef31a5d6c83d25592670e02323d
Muyuan Li [Tue, 29 Mar 2016 20:29:49 +0000 (20:29 +0000)]
Merge "sysui: refactor for extensibility" into nyc-dev
Teng-Hui Zhu [Mon, 28 Mar 2016 21:37:54 +0000 (14:37 -0700)]
Add test for AVD on SW Layer
Now we can put both HW Layer and SW Layer side by side.
Change-Id: I105d0aa6baad0e096cf71c05568323e81301e9b0
John Reck [Tue, 29 Mar 2016 20:16:04 +0000 (20:16 +0000)]
Merge "Add a font microbench" into nyc-dev
am:
a5c4545
* commit '
a5c45459d3f114f125da3357c36b5a3f659d2229':
Add a font microbench
Change-Id: Ib992cc06dcc7063283bee9840ec1b290f378adf5
Chong Zhang [Thu, 24 Mar 2016 17:21:26 +0000 (10:21 -0700)]
Animate IME adjustment for docked stack through the divider
This makes sure the top stack crop, divider position and bottom stack
surface position moves together with the IME window. Currently the
bottom stack and divider are moving together but top stack crop is
changed immediately.
bug:
27779495
Change-Id: I653ad9093621b218d9c11b0bb2efdddb1d33763e
Muyuan Li [Thu, 24 Mar 2016 03:08:26 +0000 (20:08 -0700)]
sysui: refactor for extension
Refactored ZenModePanel:
1. Button creation is split from onFinishInflate.
2. Added a method to query current Zen condition
3. Made mZenButtonsCallback protected.
Change-Id: I959fa2f7770ba1888af01eababe7c4512981332d
(cherry picked from commit
79df200108c5240c0d2a041d7d841f8d9d143ec0)
Muyuan Li [Wed, 23 Mar 2016 19:09:38 +0000 (12:09 -0700)]
sysui: refactor for extensibility
Split button creation code from init in ZenModePanel
Bug:
27101250
Change-Id: Id4bbd505b4e311fdcd2d330f20b73d2338fa9686
(cherry picked from commit
80870e93a49c08f4f4e57d2c0902d2308faa3f7a)
John Reck [Tue, 29 Mar 2016 20:07:55 +0000 (20:07 +0000)]
Merge "Add a font microbench" into nyc-dev
George Mount [Tue, 29 Mar 2016 20:07:21 +0000 (20:07 +0000)]
Merge "Ensure window has been added in isTopOfTask" into nyc-dev
am:
e6ef0f9
* commit '
e6ef0f9d77efdd5852ac2e3d768280dc3571dcf7':
Ensure window has been added in isTopOfTask
Change-Id: I16c17d62a344f4fcf71b817ab2228b13261aae7e
George Mount [Tue, 29 Mar 2016 20:02:25 +0000 (20:02 +0000)]
Merge "Ensure window has been added in isTopOfTask" into nyc-dev
George Mount [Tue, 29 Mar 2016 20:01:29 +0000 (20:01 +0000)]
Merge "Run cleanup before end actions of ViewPropertyAnimator." into nyc-dev
am:
58cf2c3
* commit '
58cf2c3da028c9e091eed03868eaaa38625b12b7':
Run cleanup before end actions of ViewPropertyAnimator.
Change-Id: I4ea31dc25223445e2aab2f2ab0c69030a53b57f3
George Mount [Tue, 29 Mar 2016 19:54:35 +0000 (19:54 +0000)]
Merge "Run cleanup before end actions of ViewPropertyAnimator." into nyc-dev
Udam Saini [Tue, 29 Mar 2016 19:46:45 +0000 (19:46 +0000)]
Merge "Calling setIsDrawerPresent(false) twice causes a crash." into nyc-dev
am:
bc5aa7a
* commit '
bc5aa7a7364088c1698784c7244df27820443797':
Calling setIsDrawerPresent(false) twice causes a crash.
Change-Id: Iea4c6a50d0ac6d3f1558640880cd99a358d5c25c
Udam Saini [Tue, 29 Mar 2016 19:42:42 +0000 (19:42 +0000)]
Merge "Calling setIsDrawerPresent(false) twice causes a crash." into nyc-dev
Jorim Jaggi [Tue, 29 Mar 2016 19:40:50 +0000 (19:40 +0000)]
Revert "Start drawing immediately"
am:
75c21ca
* commit '
75c21ca948aabbcd8b87196e966771b1dd976686':
Revert "Start drawing immediately"
Change-Id: I1b07eeaf65ca76f740393d89218d2d75ba8e5f9f
Jorim Jaggi [Tue, 29 Mar 2016 19:33:19 +0000 (19:33 +0000)]
Merge "Intersect task with stack bounds for dimming" into nyc-dev
am:
c28230c
* commit '
c28230cf97a63e939e295b52bfa65665722440b8':
Intersect task with stack bounds for dimming
Change-Id: I3408437bd2e270f82baa06dff9c20b29e17203f5
Makoto Onuki [Tue, 29 Mar 2016 19:33:15 +0000 (19:33 +0000)]
Merge "Extract signature related utilities" into nyc-dev
am:
021a48d
* commit '
021a48d50eb857aa912e5ca22ae0fff4a8b4c9dd':
Extract signature related utilities
Change-Id: Ia8c78b0f0f5aa646e00b578da4e3dd7011fec618
Chet Haase [Tue, 29 Mar 2016 19:33:12 +0000 (19:33 +0000)]
Merge "Add setHasOverlappingRendering() method" into nyc-dev
am:
fd48a32
* commit '
fd48a321c9be5e46224222c46be8667bec6f631a':
Add setHasOverlappingRendering() method
Change-Id: Ifbb72d9f334c60e1b0d964aab650dc85cba9890f
Jason Monk [Tue, 29 Mar 2016 19:33:09 +0000 (19:33 +0000)]
Merge "Fix QS expand on tablets" into nyc-dev
am:
809077d
* commit '
809077d43c2c4853b3d81fa7af6a1205d3b8c129':
Fix QS expand on tablets
Change-Id: I08011e42a629f5d36f5852a071a2795e03600b45
Jorim Jaggi [Mon, 28 Mar 2016 23:26:09 +0000 (19:26 -0400)]
Revert "Start drawing immediately"
This reverts commit
3127c2a471dbefda916701d9b3837ce109ea7d49.
The original CL caused various issues for which we don't have the
time/not willing to take the risk.
Bug:
27864389
Bug:
27451341
Jorim Jaggi [Tue, 29 Mar 2016 19:28:42 +0000 (19:28 +0000)]
Merge "Intersect task with stack bounds for dimming" into nyc-dev
Makoto Onuki [Tue, 29 Mar 2016 19:25:48 +0000 (19:25 +0000)]
Merge "Extract signature related utilities" into nyc-dev
Chet Haase [Tue, 29 Mar 2016 19:19:12 +0000 (19:19 +0000)]
Merge "Add setHasOverlappingRendering() method" into nyc-dev
Jason Monk [Tue, 29 Mar 2016 19:16:38 +0000 (19:16 +0000)]
Merge "Fix QS expand on tablets" into nyc-dev
Tyler Gunn [Tue, 29 Mar 2016 19:09:05 +0000 (19:09 +0000)]
Merge "Add missing null checks on Conference and Connection." into nyc-dev
am:
53befa2
* commit '
53befa2e0b6b8b9f4c8f9df04acef3bfff575a1f':
Add missing null checks on Conference and Connection.
Change-Id: I2d39b84b0963ab2c8b92fb4604cc848f40b44e4a
Tyler Gunn [Tue, 29 Mar 2016 19:02:07 +0000 (19:02 +0000)]
Merge "Add missing null checks on Conference and Connection." into nyc-dev
Alan Viverette [Tue, 29 Mar 2016 18:55:04 +0000 (14:55 -0400)]
Always use existing PopupWindow dimension if not otherwise specified
Removes mPopupWidth/Height, which have been moved entirely into the
width and height of the LayoutParams.
Bug:
27878812
Change-Id: Id9fe99c7d57d5c15c7fe10ea95d97be562301a8e
Andrii Kulian [Tue, 29 Mar 2016 18:37:56 +0000 (18:37 +0000)]
Merge "Add minimal width and height logging to AM dump." into nyc-dev
am:
029a28b
* commit '
029a28b7d665b0c1cfbc1f6795b18a744d2b4ba3':
Add minimal width and height logging to AM dump.
Change-Id: Ie9d7693e41981d91d64ba9fc40b8e933c3f5381f
Alan Viverette [Tue, 29 Mar 2016 18:37:53 +0000 (18:37 +0000)]
Merge "Use default implementation for onForwardingStopped() in action menu" into nyc-dev
am:
f25ea2f
* commit '
f25ea2fece6dfe3c63cd063e5342e0102ee6d1f3':
Use default implementation for onForwardingStopped() in action menu
Change-Id: I884e15fce160a4cdefbad3418bfe6213f1977a1e
Paul Crowley [Tue, 29 Mar 2016 18:37:51 +0000 (18:37 +0000)]
Merge "Continue to remove users when destroyUserKey fails." into nyc-dev
am:
f410244
* commit '
f41024461bf14a768ee39edf5f857e45725ee0fe':
Continue to remove users when destroyUserKey fails.
Change-Id: Ic3fbb44439c4b654cc2e3d5898563ef2e848dc0a
Christopher Tate [Tue, 29 Mar 2016 18:37:49 +0000 (18:37 +0000)]
Merge "Clean up a couple of bugs about transport init staging" into nyc-dev
am:
09d83b0
* commit '
09d83b032e5f456750f2f3149aa4932836643957':
Clean up a couple of bugs about transport init staging
Change-Id: I0c32b31bf82b1d3ed798263816ca789c3a7305d8
John Reck [Tue, 29 Mar 2016 18:37:46 +0000 (18:37 +0000)]
Merge "Fix array out of bounds access in JankTracker" into nyc-dev
am:
f01e4af
* commit '
f01e4af5a3af7ceb7d022660953d3ed6ab2e193c':
Fix array out of bounds access in JankTracker
Change-Id: I7a999da1b8cafe96b5739f1361be7428ffc26b80
Roshan Pius [Tue, 29 Mar 2016 18:37:43 +0000 (18:37 +0000)]
Merge changes from topic \'wifi_tx_power_levels\' into nyc-dev
am:
89d9480
* commit '
89d9480be2dbb33e97a6efdf45bc6790eff1e5d0':
Add new wifi tx power levels in Wifi activity energy
Add new wifi tx power levels in link layer stats
Change-Id: Ib984bd23cefc6fadcf750d6aef56f788227b853b
Markus Michler [Tue, 29 Mar 2016 18:34:03 +0000 (18:34 +0000)]
Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()" am:
7160459
am:
ae975ab
* commit '
ae975aba7372b18cbf7f30cdc4b74cff32cc3558':
Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()
Change-Id: I565ec862ff883bac9894aeec6fc63b7ce323e00c
Markus Michler [Tue, 29 Mar 2016 18:30:31 +0000 (18:30 +0000)]
Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()"
am:
7160459
* commit '
71604596117c02a885da356cd0015c29493e48bc':
Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()
Change-Id: I5d522742dc4c7a46a74dfe4838c5bde8aadd8789
Andrii Kulian [Tue, 29 Mar 2016 18:28:08 +0000 (18:28 +0000)]
Merge "Add minimal width and height logging to AM dump." into nyc-dev
Alan Viverette [Tue, 29 Mar 2016 18:25:30 +0000 (18:25 +0000)]
Merge "Use default implementation for onForwardingStopped() in action menu" into nyc-dev
Paul Crowley [Tue, 29 Mar 2016 18:25:10 +0000 (18:25 +0000)]
Merge "Continue to remove users when destroyUserKey fails." into nyc-dev
Adam Lesinski [Tue, 29 Mar 2016 18:24:39 +0000 (18:24 +0000)]
Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()"
Chris Tate [Tue, 29 Mar 2016 18:18:11 +0000 (18:18 +0000)]
Merge "Clean up a couple of bugs about transport init staging" into nyc-dev
John Reck [Tue, 29 Mar 2016 18:08:49 +0000 (18:08 +0000)]
Merge "Fix array out of bounds access in JankTracker" into nyc-dev
Michal Karpinski [Mon, 21 Mar 2016 13:39:42 +0000 (13:39 +0000)]
Moving app process logging from AMS to PMS
Bug:
26796347
Change-Id: I21894c2edb41929f6ecd3880667c53e00acef677
Andreas Gampe [Tue, 29 Mar 2016 17:52:33 +0000 (10:52 -0700)]
Frameworks/base: Refactor package manager
Minimal cherry-pick to keep things alive.
Bug:
27689078
(cherry picked from commit
bdd30d86ef98456161069d11481b2ccd25a11b4e)
Change-Id: I06b9d75f58c59cb07ef5170f784ea6745168efaa
Roshan Pius [Tue, 29 Mar 2016 18:03:35 +0000 (18:03 +0000)]
Merge changes from topic 'wifi_tx_power_levels' into nyc-dev
* changes:
Add new wifi tx power levels in Wifi activity energy
Add new wifi tx power levels in link layer stats
Chet Haase [Wed, 23 Mar 2016 15:23:14 +0000 (08:23 -0700)]
Add setHasOverlappingRendering() method
View.hasOverlappingRendering() is an important performance tweak that
subclasses can override to do the right thing return false when appropriate
to avoid expensive operations when view is translucent).
But this requires subclassing View to get this behavior.
This new API allows the property to be set from outside, enabling
standard views to have this behavior set. When the new method is called,
the behavior will derive from whatever it was set to. Otherwise, it
will default to the old/overriden behavior.
Issue #
16561361 Make hasOverlappingRendering settable from outside/XML
Change-Id: If0fbc8667cdb82b1d85e795e782716a07196f3c0
Udam Saini [Tue, 29 Mar 2016 17:49:18 +0000 (10:49 -0700)]
Calling setIsDrawerPresent(false) twice causes a crash.
We should only call setDrawerLockMode(...) if mDrawerLayout isn't
null.
bug:
26288300
Change-Id: I8a1b77e03414360f9cd7e3fa6e6c98ef0e139ebf
Aga Wronska [Tue, 29 Mar 2016 17:43:13 +0000 (17:43 +0000)]
Merge "Action OPEN_DOCUMENT_TREE shows advanced roots ignoring config flag Fixed:
27856396" into nyc-dev
am:
160222a
* commit '
160222a4390d7738b541ed3f5c116d22c1fda04b':
Action OPEN_DOCUMENT_TREE shows advanced roots ignoring config flag Fixed:
27856396
Change-Id: Ib95b556451834579045eb71ad5ec202e50873049