OSDN Git Service
Colin Cross [Fri, 11 Apr 2014 05:41:05 +0000 (22:41 -0700)]
resolved conflicts for merge of
90b39aba to master-lockscreen-dev
Change-Id: I2871a1e49c3b443cc7479f2352c652be3b0fb85b
Colin Cross [Fri, 11 Apr 2014 05:16:11 +0000 (05:16 +0000)]
Merge "fix build"
Colin Cross [Fri, 11 Apr 2014 05:05:57 +0000 (22:05 -0700)]
fix build
Fix make checkbuild.
Change-Id: Ie9335a9e8afe4dc13ec47b2e84ab433b19ff315f
Alan Viverette [Fri, 11 Apr 2014 02:57:03 +0000 (02:57 +0000)]
am
eed2be4e: Merge "Fix support for TouchFeedbackDrawable tint mode"
* commit '
eed2be4eab2b43618bd5e89c4a228b9988af8c65':
Fix support for TouchFeedbackDrawable tint mode
Alan Viverette [Fri, 11 Apr 2014 02:55:31 +0000 (02:55 +0000)]
Merge "Fix support for TouchFeedbackDrawable tint mode"
Sungsoo Lim [Fri, 11 Apr 2014 02:29:46 +0000 (02:29 +0000)]
am
f0e74f08: Merge "Add equals, hashCode, and toString methods in TvInputInfo."
* commit '
f0e74f08a1a11a6d7bb25f34350ff996716036a1':
Add equals, hashCode, and toString methods in TvInputInfo.
Alan Viverette [Fri, 11 Apr 2014 02:27:58 +0000 (19:27 -0700)]
Fix support for TouchFeedbackDrawable tint mode
Change-Id: I86bff1c5e69d9a193deb52559948b20ddca99751
Sungsoo Lim [Fri, 11 Apr 2014 02:27:21 +0000 (02:27 +0000)]
Merge "Add equals, hashCode, and toString methods in TvInputInfo."
Sungsoo Lim [Thu, 10 Apr 2014 07:41:57 +0000 (16:41 +0900)]
Add equals, hashCode, and toString methods in TvInputInfo.
Change-Id: I770e0eeac334d2c0b98ef0941bc9840296360e4f
Alan Viverette [Fri, 11 Apr 2014 01:16:17 +0000 (01:16 +0000)]
am
494fb7b5: Update volume panel
* commit '
494fb7b58a21a7a9a8eba3bacecffe115edcb8c6':
Update volume panel
Alan Viverette [Fri, 11 Apr 2014 01:12:56 +0000 (18:12 -0700)]
Update volume panel
Change-Id: I6f0887069598f8addc5c5af5aef9c07a69532424
Amith Yamasani [Fri, 11 Apr 2014 00:33:44 +0000 (00:33 +0000)]
am
c095ca1c: Merge "Corp badging for Recents"
* commit '
c095ca1cb8877121f768b5b6940e4025e810d4ba':
Corp badging for Recents
Amith Yamasani [Fri, 11 Apr 2014 00:30:35 +0000 (00:30 +0000)]
Merge "Corp badging for Recents"
Amith Yamasani [Thu, 10 Apr 2014 20:48:15 +0000 (13:48 -0700)]
Corp badging for Recents
Badge apps that belong to the corp profile when shown in the recents list.
Add a userId to TaskKey to help with caching.
Bug:
11676348
Change-Id: I92c8262dce763de89497977fcc6a53899afda136
Zhijun He [Fri, 11 Apr 2014 00:15:12 +0000 (00:15 +0000)]
am
438d77e0: MediaFrameworkTest: Fix Camera2 API unit test build breakage
* commit '
438d77e0429f78def6c0cb3c21095202c71b8220':
MediaFrameworkTest: Fix Camera2 API unit test build breakage
Zhijun He [Fri, 11 Apr 2014 00:09:22 +0000 (17:09 -0700)]
MediaFrameworkTest: Fix Camera2 API unit test build breakage
Change-Id: I49329e2c3bbf1290f1f6e7c64dbb56eb831e5a96
Adrian Roos [Thu, 10 Apr 2014 23:43:21 +0000 (23:43 +0000)]
Merge "Set a dark theme for SystemUI." into master-lockscreen-dev
Adrian Roos [Thu, 10 Apr 2014 21:25:03 +0000 (23:25 +0200)]
Set a dark theme for SystemUI.
The default theme for the platform has changed to a
light variant. This puts SystemUI back in the dark.
Bug:
13635952
Change-Id: I230a2078ba6bf5a79c768f0e357fcbd75f283cf8
Alan Viverette [Thu, 10 Apr 2014 23:17:50 +0000 (23:17 +0000)]
am
316e533a: Merge "Update brightness icons to use color attribute"
* commit '
316e533ab0ac9888af9e6c3db44e886dd50312e1':
Update brightness icons to use color attribute
Alan Viverette [Thu, 10 Apr 2014 23:15:45 +0000 (23:15 +0000)]
Merge "Update brightness icons to use color attribute"
Alan Viverette [Thu, 10 Apr 2014 23:14:40 +0000 (16:14 -0700)]
Update brightness icons to use color attribute
BUG:
13961573
Change-Id: I6c7f85c8cda739cb1e5e14c39c7e4a9fe20a8650
Jean-Michel Trivi [Thu, 10 Apr 2014 23:14:07 +0000 (23:14 +0000)]
am
cf3f3c27: Merge "MediaFocusControl: fix comment"
* commit '
cf3f3c27364cf82619e50436f3f9d308dc669229':
MediaFocusControl: fix comment
Jean-Michel Trivi [Thu, 10 Apr 2014 23:11:28 +0000 (23:11 +0000)]
Merge "MediaFocusControl: fix comment"
Jorim Jaggi [Thu, 10 Apr 2014 23:06:25 +0000 (23:06 +0000)]
Merge "Hide back button on keyguard and make it work for bouncer." into master-lockscreen-dev
Selim Cinek [Thu, 10 Apr 2014 22:58:18 +0000 (22:58 +0000)]
Merge "Fix first child handling with GONE children." into master-lockscreen-dev
Jorim Jaggi [Thu, 10 Apr 2014 22:47:18 +0000 (00:47 +0200)]
Fix first child handling with GONE children.
Bug:
13635952
Change-Id: I970f39a2a33d957f32d3290999fd007f0d323b3b
ztenghui [Thu, 10 Apr 2014 22:43:43 +0000 (22:43 +0000)]
am
8a5c99c9: Merge "Fix path interpretation on curves"
* commit '
8a5c99c9e91fc86875f3c11f621a9e8a50c5831b':
Fix path interpretation on curves
ztenghui [Thu, 10 Apr 2014 22:40:35 +0000 (22:40 +0000)]
Merge "Fix path interpretation on curves"
Raph Levien [Thu, 10 Apr 2014 22:29:34 +0000 (22:29 +0000)]
am
6d954bbd: Merge "Fix build breakage"
* commit '
6d954bbdf5a5c0246ea8bfb5ed1cfb56060bbe56':
Fix build breakage
John Reck [Thu, 10 Apr 2014 22:26:01 +0000 (22:26 +0000)]
am
822bbb38: Merge "Make attachFunctor blocking"
* commit '
822bbb382fa6b6c8d1b45770e27c2c2732a7afb7':
Make attachFunctor blocking
Raph Levien [Thu, 10 Apr 2014 22:24:54 +0000 (22:24 +0000)]
Merge "Fix build breakage"
John Reck [Thu, 10 Apr 2014 22:23:22 +0000 (22:23 +0000)]
Merge "Make attachFunctor blocking"
Raph Levien [Thu, 10 Apr 2014 22:12:30 +0000 (15:12 -0700)]
Fix build breakage
A recent change to remove VectorDrawable methods from the public api
didn't run update-api. This should fix that build.
Change-Id: I4d86221f5ada96113f673def4b32985c6d60110a
Jean-Michel Trivi [Thu, 10 Apr 2014 22:05:44 +0000 (15:05 -0700)]
MediaFocusControl: fix comment
Comment about role of audio focus isn't valid anymore.
Change-Id: I608d8cf9d5d9c4449384e2788e5eb5ea42c97eca
John Reck [Thu, 10 Apr 2014 22:00:13 +0000 (15:00 -0700)]
Make attachFunctor blocking
Bug:
13930200
Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
Alan Viverette [Thu, 10 Apr 2014 21:36:32 +0000 (21:36 +0000)]
am
4b1a7c20: Fix build breakage
* commit '
4b1a7c203d5e32c8b2dc7f4f54f28559ca31860a':
Fix build breakage
John Reck [Thu, 10 Apr 2014 21:36:29 +0000 (21:36 +0000)]
am
a47c3cc5: Merge "Remove sync flush"
* commit '
a47c3cc5375777a9adbc0dba95e6f133541f8d28':
Remove sync flush
Jorim Jaggi [Thu, 10 Apr 2014 21:26:13 +0000 (23:26 +0200)]
resolved conflicts for merge of
ff0978fd to master-lockscreen-dev
Change-Id: I03881da30db8189005d50812e5528ed07cebd437
Alan Viverette [Thu, 10 Apr 2014 21:28:30 +0000 (14:28 -0700)]
Fix build breakage
Change-Id: I73d9ff5f38986b7acf83b85c1989203f472bc5fd
John Reck [Thu, 10 Apr 2014 21:13:07 +0000 (21:13 +0000)]
Merge "Remove sync flush"
Selim Cinek [Thu, 10 Apr 2014 21:01:28 +0000 (21:01 +0000)]
Merge "Further improved NotificationStackScroller"
Jianing Wei [Thu, 10 Apr 2014 19:54:58 +0000 (19:54 +0000)]
am
dcb495ff: Merge "Camera2 API: enable burst capture and repeating burst."
* commit '
dcb495ff86b1322256585dbd5eda92949a1e8a4f':
Camera2 API: enable burst capture and repeating burst.
Jianing Wei [Thu, 10 Apr 2014 19:51:57 +0000 (19:51 +0000)]
Merge "Camera2 API: enable burst capture and repeating burst."
Alan Viverette [Thu, 10 Apr 2014 19:50:07 +0000 (19:50 +0000)]
am
de5a29de: Merge "Cleaning up VectorDrawable"
* commit '
de5a29deaed1c527a78441189e64a40cdf3d82d3':
Cleaning up VectorDrawable
Jianing Wei [Fri, 28 Mar 2014 01:27:43 +0000 (18:27 -0700)]
Camera2 API: enable burst capture and repeating burst.
* Enable sending out burst requests, canceling, and flushing.
* Enable onCaptureStarted, onResultReceived for bursts.
* Enable onCaptureSequenceCompleted by tracking frame number.
Change-Id: Ica2b031cac7ad90f9c4b74a78e6185e627195340
Bug-ID:
10749500
Svetoslav [Thu, 10 Apr 2014 19:48:07 +0000 (12:48 -0700)]
resolved conflicts for merge of
6be2f952 to master-lockscreen-dev
Conflicts:
core/java/android/view/IWindowManager.aidl
tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
Adrian Roos [Thu, 10 Apr 2014 19:43:40 +0000 (19:43 +0000)]
Merge "Implement camera affordance" into master-lockscreen-dev
Alan Viverette [Thu, 10 Apr 2014 19:38:24 +0000 (19:38 +0000)]
Merge "Cleaning up VectorDrawable"
Selim Cinek [Tue, 8 Apr 2014 00:27:49 +0000 (02:27 +0200)]
Further improved NotificationStackScroller
The top card is now collapsed during the pulldown of
the notification shade and expanded during the transition.
The scrollstate is also reset once the shade is closed.
Change-Id: Ibf17eef1f338d674c545e5bf55261e60db62b2ce
Svetoslav [Thu, 10 Apr 2014 19:32:59 +0000 (19:32 +0000)]
Merge "Adding render stats APIs to UiAutomation (framework)."
Chris Wren [Thu, 10 Apr 2014 19:20:07 +0000 (19:20 +0000)]
am
2bb8dde4: Merge "support the people extra on the notification object"
* commit '
2bb8dde44be10212ec453d435aaad27177714f5e':
support the people extra on the notification object
Chris Wren [Thu, 10 Apr 2014 19:18:31 +0000 (19:18 +0000)]
Merge "support the people extra on the notification object"
Chris Wren [Wed, 26 Mar 2014 21:24:15 +0000 (17:24 -0400)]
support the people extra on the notification object
currently supported URIs:
content://com.android.contacts/contacts/lookup/*
tel:*
Change-Id: I833eee3f2ee40aa8cb2cfad135bdd6cb2c0eb792
Jorim Jaggi [Thu, 10 Apr 2014 18:37:32 +0000 (20:37 +0200)]
Hide back button on keyguard and make it work for bouncer.
Bug:
13635952
Change-Id: Ie9824dd9926c9deb0a38c8e0a6161f605a489622
Alan Viverette [Thu, 10 Apr 2014 18:14:45 +0000 (11:14 -0700)]
Cleaning up VectorDrawable
Use argb evaluation method from animation package, lazily create paint,
set default for stroke line cap and join. Fix scaling to bounds. Fix
drawable in test app.
Change-Id: I245d5d6acc6ba9806743ab2bf9bf99aff3649c39
John Reck [Thu, 10 Apr 2014 17:28:45 +0000 (10:28 -0700)]
Remove sync flush
Bug:
13952590
It was attempting to flush state changes after the canvas was
destroyed, which caused layer updates to crash.
Due to the removal of SetDisplayListData, the sync mode isn't able
to do anything ever, so remove it.
Change-Id: I1e18ce288d81fd47cc6e612afda9476f75ecef2e
Jorim Jaggi [Thu, 10 Apr 2014 17:43:38 +0000 (17:43 +0000)]
Merge "Limit notifications on lockscreen to a maximum 4." into master-lockscreen-dev
Baligh Uddin [Thu, 10 Apr 2014 16:02:22 +0000 (16:02 +0000)]
am
2271a91c: (-s ours) am
cd5e3f85: (-s ours) am
da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
2271a91c327cee8a6c1dffcbfd3419c95d56c37e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:58:38 +0000 (15:58 +0000)]
am
cd5e3f85: (-s ours) am
da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
cd5e3f85fc9228b943ee8dfda0951e068953596c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:55:25 +0000 (15:55 +0000)]
am
da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
da6b9599c77230c689d63e32ca80b62f60f18c27':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:55:04 +0000 (15:55 +0000)]
am
8c22e367: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
8c22e3674258261d9870f48e752572d438838fe1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:51:37 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 10 Apr 2014 15:51:35 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 10 Apr 2014 15:51:33 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev
Adrian Roos [Thu, 10 Apr 2014 02:21:31 +0000 (04:21 +0200)]
Implement camera affordance
Makes camera on lockscreen work again.
Bug:
13635952
Change-Id: Iec6324651a23289932a5e9816332b6727c23d096
Jorim Jaggi [Thu, 10 Apr 2014 00:45:55 +0000 (02:45 +0200)]
Limit notifications on lockscreen to a maximum 4.
All the other notifications are going to be collapsed in a "n more"
card.
Bug:
13635952
Change-Id: I18471c7b18d05d27e92c49ee8214605f1a151927
Paul Lawrence [Thu, 10 Apr 2014 14:33:29 +0000 (14:33 +0000)]
am
9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection"
* commit '
9502f990899ef576879048ec5147d403158ad89d':
Allow encryption when keyguard is set to pattern or no protection
Paul Lawrence [Thu, 10 Apr 2014 14:30:52 +0000 (14:30 +0000)]
Merge "Allow encryption when keyguard is set to pattern or no protection"
Narayan Kamath [Thu, 10 Apr 2014 11:31:15 +0000 (11:31 +0000)]
am
edd6d9e3: am
3603970d: am
940e76fd: am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
edd6d9e3a87d47b42d9119b70d1f442c3fa98c35':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:28:34 +0000 (11:28 +0000)]
am
3603970d: am
940e76fd: am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
3603970d3a8a2215027e96c4861e1ab9eec86f79':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:25:56 +0000 (11:25 +0000)]
am
940e76fd: am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:21:33 +0000 (11:21 +0000)]
am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
b827f78e7acee3a604c315615268edf7098dc184':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:18:28 +0000 (11:18 +0000)]
Merge "Removed android.debug.JNITest from preloaded-classes"
Narayan Kamath [Thu, 10 Apr 2014 09:47:21 +0000 (09:47 +0000)]
am
f148f36d: am
9e289d70: am
1d26a3f1: am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
f148f36d140e995ec8f755e60bbb0b37f33c3da7':
System services detect and register app CPU ABIs
Narayan Kamath [Thu, 10 Apr 2014 09:47:18 +0000 (09:47 +0000)]
am
d11f223c: resolved conflicts for merge of
286a247e to master
* commit '
d11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4':
Re-implement native library search and copies.
Narayan Kamath [Thu, 10 Apr 2014 09:45:18 +0000 (09:45 +0000)]
am
9e289d70: am
1d26a3f1: am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
9e289d70a8baaed0030413b5991653792e2a816d':
System services detect and register app CPU ABIs
Narayan Kamath [Thu, 10 Apr 2014 09:37:17 +0000 (10:37 +0100)]
resolved conflicts for merge of
286a247e to master
Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
Narayan Kamath [Thu, 10 Apr 2014 09:26:59 +0000 (09:26 +0000)]
am
1d26a3f1: am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
1d26a3f1efd0d965e8751e8515608c31789bdbe2':
System services detect and register app CPU ABIs
Narayan Kamath [Thu, 10 Apr 2014 09:26:44 +0000 (09:26 +0000)]
am
0fd40cb1: am
80413c9f: Merge "Re-implement native library search and copies."
* commit '
0fd40cb100bccbd5d9ad6109ca39c818a857f889':
Re-implement native library search and copies.
Narayan Kamath [Thu, 10 Apr 2014 09:23:33 +0000 (09:23 +0000)]
am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
System services detect and register app CPU ABIs
Narayan Kamath [Thu, 10 Apr 2014 09:23:30 +0000 (09:23 +0000)]
am
80413c9f: Merge "Re-implement native library search and copies."
* commit '
80413c9fe10acf36eaecd139198c7fc17e8af2e6':
Re-implement native library search and copies.
Narayan Kamath [Thu, 10 Apr 2014 09:20:21 +0000 (09:20 +0000)]
Merge "System services detect and register app CPU ABIs"
Narayan Kamath [Thu, 10 Apr 2014 09:19:38 +0000 (09:19 +0000)]
Merge "Re-implement native library search and copies."
Jessica Hummel [Thu, 10 Apr 2014 08:41:51 +0000 (08:41 +0000)]
am
e5e8444c: Merge "Allow setting the active admin across users."
* commit '
e5e8444ce864e7ac5d07308b9a5c5ca2caaa4e0a':
Allow setting the active admin across users.
Jessica Hummel [Thu, 10 Apr 2014 08:16:27 +0000 (08:16 +0000)]
Merge "Allow setting the active admin across users."
Jessica Hummel [Fri, 4 Apr 2014 11:42:17 +0000 (12:42 +0100)]
Allow setting the active admin across users.
This is required so that provisioning can call it from the primary user when it sets up the mdm on the managed profile.
Change-Id: I185af168754aa4aeae61f1d4522c1794681cb400
Zhijun He [Thu, 10 Apr 2014 02:10:41 +0000 (02:10 +0000)]
am
9ce83761: Merge "Camera2: Add MANUAL capture intent"
* commit '
9ce83761cc9908e6acad8af5ad45574163b28b19':
Camera2: Add MANUAL capture intent
Zhijun He [Thu, 10 Apr 2014 02:07:36 +0000 (02:07 +0000)]
Merge "Camera2: Add MANUAL capture intent"
Zhijun He [Thu, 10 Apr 2014 02:04:31 +0000 (19:04 -0700)]
Camera2: Add MANUAL capture intent
Change-Id: I6a3ba818cc7d13e0fcf0d90a16c53884b6cc20ab
Zhihai Xu [Thu, 10 Apr 2014 01:13:51 +0000 (01:13 +0000)]
am
7e6fe14f: am
54499194: am
2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev
* commit '
7e6fe14f0264cef4fa2e0e3bbe5ea26c9a211ec6':
LE: Return false if an attribute read/write is in progress
Jesse Gunsch [Thu, 10 Apr 2014 01:13:48 +0000 (01:13 +0000)]
am
ece41093: am
3c1c1375: am
8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
* commit '
ece410939fbb7a463c79ea63adf3b96c12dc386e':
Merge "NsdService does not clean up after exiting clients"
Zhihai Xu [Thu, 10 Apr 2014 01:07:26 +0000 (01:07 +0000)]
am
54499194: am
2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev
* commit '
544991946287bdd3a9e6a71855642e378594bf73':
LE: Return false if an attribute read/write is in progress
Jesse Gunsch [Thu, 10 Apr 2014 01:07:23 +0000 (01:07 +0000)]
am
3c1c1375: am
8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
* commit '
3c1c137579783fad81169da01d5c7c5819c81b07':
Merge "NsdService does not clean up after exiting clients"
John Reck [Thu, 10 Apr 2014 00:16:52 +0000 (00:16 +0000)]
am
9817ddd4: Merge "Merge hasFunctors & pushStaging into prepareTree"
* commit '
9817ddd420aaa885f92f778ae2cfd17e6a71bc87':
Merge hasFunctors & pushStaging into prepareTree
John Reck [Thu, 10 Apr 2014 00:14:10 +0000 (00:14 +0000)]
Merge "Merge hasFunctors & pushStaging into prepareTree"
Adrian Roos [Thu, 10 Apr 2014 00:08:22 +0000 (00:08 +0000)]
Merge "Keep lockscreen open when all notifications are gone" into master-lockscreen-dev
Deepanshu Gupta [Thu, 10 Apr 2014 00:02:34 +0000 (00:02 +0000)]
am
8aa7a967: Merge "Support custom views using TimePickerDialog in layoutlib"
* commit '
8aa7a9677af8f235ade204602014a5e2e9f9188e':
Support custom views using TimePickerDialog in layoutlib
John Reck [Thu, 10 Apr 2014 00:00:04 +0000 (17:00 -0700)]
Merge hasFunctors & pushStaging into prepareTree
Bug:
13902607
Fixes synchronous mode for WebView in HardwareLayers
Change-Id: I90de1e26dcfd9b75cc2f03bac72705fc23237b68
Adrian Roos [Wed, 9 Apr 2014 23:59:57 +0000 (01:59 +0200)]
Keep lockscreen open when all notifications are gone
Whack-a-bug time!
Bug:
13635952
Change-Id: I1941271fb1638cc60f1a1311369b4703ff83c76b
Deepanshu Gupta [Wed, 9 Apr 2014 23:59:25 +0000 (23:59 +0000)]
Merge "Support custom views using TimePickerDialog in layoutlib"
OSDN Git Service
