OSDN Git Service
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:09 +0000 (08:51 +0000)]
am
ae74287e: (-s ours) am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
ae74287e036b432ca394cbc497386547b16c17ff':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:06 +0000 (08:51 +0000)]
am
ae4cb17a: (-s ours) am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
ae4cb17a14d2a66961728d3cbd907cdba3f2f6d6':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:02 +0000 (08:51 +0000)]
am
d00d2ff2: (-s ours) am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
d00d2ff2079ca4e77173e3389834416494c7900f':
Fix Tests after cherry picks. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:58 +0000 (08:50 +0000)]
am
735229c5: (-s ours) am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
735229c5a8286f1ecff5cf54d9ce2c06d7f97d51':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:54 +0000 (08:50 +0000)]
am
925abb6d: (-s ours) am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
925abb6d983aef0016b5828349d53cc5a11ebad8':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:51 +0000 (08:50 +0000)]
am
a21ca344: (-s ours) am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
a21ca3449457c5a80b5f06ca9a1fe7b17eb33bff':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:47 +0000 (08:50 +0000)]
am
93bf0696: (-s ours) am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
93bf0696e74282fea614120f7e26951111150e48':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:43 +0000 (08:50 +0000)]
am
ddbd9bec: (-s ours) am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
ddbd9bec76036fb2ce9f1cd1b7ccb70bd859a1a5':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:38 +0000 (08:50 +0000)]
am
1cbf17f7: (-s ours) am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
1cbf17f7654d5ddb66ce76e0f50fe7f170726e20':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:34 +0000 (08:50 +0000)]
am
d332ff3e: (-s ours) am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
d332ff3e3f647b9514ecff1f146464fbc1a93372':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:31 +0000 (08:50 +0000)]
am
c2ffb54f: (-s ours) am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
c2ffb54fe29d5fcbdd866fd304a9e97af825221a':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Justin Koh [Thu, 2 Oct 2014 08:50:27 +0000 (08:50 +0000)]
am
bf6f081c: (-s ours) am
37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '
bf6f081cda7360810645cf6bf932687df1cfae00':
DO NOT MERGE Hide the volume panel for watches for now
Andreas Gampe [Thu, 2 Oct 2014 08:45:45 +0000 (08:45 +0000)]
Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev
Andreas Gampe [Thu, 2 Oct 2014 08:42:00 +0000 (08:42 +0000)]
Revert "Frameworks/base: Update to preloaded-classes"
Breaks shamu for unknown reason.
This reverts commit
da3050614fc9dc31d39ff87ae5df0261fb76f93c.
Bug:
17480683
Change-Id: Id10ff18ef6e3acb5eb84196f7e5608add7edeb66
Sreeram Ramachandran [Thu, 2 Oct 2014 06:26:26 +0000 (06:26 +0000)]
Merge "Send app permissions to netd." into lmp-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:38:44 +0000 (03:38 +0000)]
am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
fca5e5577f3690b03e783e4208379011aec46d28':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:24 +0000 (03:34 +0000)]
am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:19 +0000 (03:34 +0000)]
am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
579338345721351313d4c3cd2a5114a0d135028d':
Fix Tests after cherry picks. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:14 +0000 (03:34 +0000)]
am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
52af468b5e0b6daa1906694b37584366d616159f':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:10 +0000 (03:34 +0000)]
am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
891f38d181505406298bb3b922a33e24de6aaf02':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:06 +0000 (03:34 +0000)]
am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
a2f088b6775f0cd0a8b7e3b35e16f13de3f67b01':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:01 +0000 (03:34 +0000)]
am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
541e6e5d47b928f3cd73f9e8f1da83ff722892c8':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:57 +0000 (03:33 +0000)]
am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
2d77fad26b0fa2203366d08aeccec9b564a70647':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:53 +0000 (03:33 +0000)]
am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
ffa4115a0ed065d816171c68609cd738672f5e51':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:48 +0000 (03:33 +0000)]
am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
bae6442159838206d826775bcebf92fa86f64a93':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:42 +0000 (03:33 +0000)]
am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
60f3676e087db7baa8e67b9cbd18cffc90c4ac09':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:32:27 +0000 (03:32 +0000)]
Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:27:41 +0000 (03:27 +0000)]
Merge "Always resolve enum when resolving resources." into lmp-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:48 +0000 (03:26 +0000)]
Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:43 +0000 (03:26 +0000)]
Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:37 +0000 (03:26 +0000)]
Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:31 +0000 (03:26 +0000)]
Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:21 +0000 (03:26 +0000)]
Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:04 +0000 (03:26 +0000)]
Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:02 +0000 (03:26 +0000)]
Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:42 +0000 (03:25 +0000)]
Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:36 +0000 (03:25 +0000)]
Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:31 +0000 (03:25 +0000)]
Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
Sreeram Ramachandran [Wed, 24 Sep 2014 16:16:19 +0000 (09:16 -0700)]
Send app permissions to netd.
Based largely off Robert's http://ag/546170 (thanks!)
Bug:
15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
Dianne Hackborn [Thu, 2 Oct 2014 00:23:17 +0000 (00:23 +0000)]
Merge "More work on issue #
17656716: Unhandled exception in Window Manager" into lmp-dev
Erik Pasternak [Thu, 2 Oct 2014 00:00:39 +0000 (00:00 +0000)]
Merge "Implement auto-sleep functionality." into lmp-dev
Dianne Hackborn [Wed, 1 Oct 2014 21:59:58 +0000 (14:59 -0700)]
More work on issue #
17656716: Unhandled exception in Window Manager
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock. This was the original intention
of it, but part was missed.
Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it. And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing. So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.
Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.
Oh and fix a crash in the settings provider I noticed in APR.
Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
Jeff Sharkey [Wed, 1 Oct 2014 23:43:55 +0000 (23:43 +0000)]
Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
Dianne Hackborn [Wed, 1 Oct 2014 23:29:48 +0000 (23:29 +0000)]
Merge "Fix issue #
17740687: Device does not boot after flashing LMP dev TOT(
1478825) build." into lmp-dev
ztenghui [Wed, 1 Oct 2014 23:29:31 +0000 (23:29 +0000)]
Merge "+ correcting shadow visual appearance (b/
17610926)" into lmp-dev
Jeff Sharkey [Wed, 1 Oct 2014 23:02:05 +0000 (16:02 -0700)]
Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
Some system apps doing hotword training need low-level access to
audio hardware, beyond what the existing HAL offers. For now, give
them the audio GID.
Bug:
17763721
Change-Id: I8025c3abacae13a6ffec4e10e4976a67ab505bdf
Svetoslav [Wed, 1 Oct 2014 23:24:46 +0000 (23:24 +0000)]
Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev
Dianne Hackborn [Wed, 1 Oct 2014 23:21:10 +0000 (23:21 +0000)]
Merge "Revert white space changes." into lmp-dev
ztenghui [Wed, 1 Oct 2014 23:10:16 +0000 (16:10 -0700)]
+ correcting shadow visual appearance (b/
17610926)
+ adjusting spot and ambient shadow opacity constants to achieve desired appearance
+ reducing ambient scale ratio back to 1.0 to address over-lightening at higher elevations
+ partially revert ag/546290
Change-Id: I9d7f664f73a7b9b83df73b739103c97054bd4f6e
Stephen Hines [Wed, 1 Oct 2014 22:53:59 +0000 (22:53 +0000)]
Merge "include direct.h for _mkdir" into lmp-dev
Winson Chung [Wed, 1 Oct 2014 22:53:27 +0000 (22:53 +0000)]
Merge "Fixing invalid check to get component enabled state. (Bug
17679693)" into lmp-dev
Dianne Hackborn [Wed, 1 Oct 2014 22:53:28 +0000 (15:53 -0700)]
Fix issue #
17740687: Device does not boot after flashing LMP dev TOT(
1478825) build.
There was a path through idle where we could clear mBooting but not set
mBooted, so we would no longer start activities. This is probably happening
because if you start a user or userdebug build with the device plugged in
to adb, the system early on starts the USB security dialog, before home is
started. If that goes idle first, we will end up in the case where we
clear booting (because something went idle) but not set booted (because it
was not home that went idle).
Change this so that we always set booted when clearing booting.
Change-Id: I40053710eefa939315aeb9475ecdd2e8a87351ff
Dianne Hackborn [Wed, 1 Oct 2014 22:09:51 +0000 (15:09 -0700)]
Revert white space changes.
Change-Id: I3bc9995adf5cefd91f5a9fd4d2a701056dba3ca9
Hui Shu [Wed, 1 Oct 2014 22:10:20 +0000 (22:10 +0000)]
Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev
Svetoslav [Wed, 1 Oct 2014 19:50:58 +0000 (12:50 -0700)]
Fix accessiblity introspection from the shell user regression.
Accessibility introspection APIs are meant to query only the state of
the current user. There are command line tools that run as the shell
user and want to be able to intropspect the screen. When resolving
the calling user we were using the calling user id instead of the
special constant for the current user.
Now when resolving the calling user for intrspection we are using
the current user constant and consequentially only the current
user or a profile of the current user or the root or the shell or
the system or an app with cross user permission can introspect the
screen.
bug:
17674631
Change-Id: I36d1d7b65441d04c3b4204123c4b6d036ff032c0
Winson Chung [Wed, 1 Oct 2014 21:30:05 +0000 (14:30 -0700)]
Fixing invalid check to get component enabled state. (Bug
17679693)
Change-Id: I225d59bf766122d667d990d7e5b1971c6e8af2aa
Jeff Brown [Wed, 1 Oct 2014 03:54:30 +0000 (20:54 -0700)]
Implement auto-sleep functionality.
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity. By default this
value is set to -1 which maintains today's existing behavior.
We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM. When the sleep timeout expires, the state is cleared and
the dream ends.
Bug:
17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
Hui Shu [Wed, 1 Oct 2014 21:41:07 +0000 (21:41 +0000)]
Revert "Remove WebView DRP Setting from Developer Settings"
This reverts commit
eb487c63017ae5cb0f3f35bf8b17c5f3bbb0f456.
Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
wsmlby [Wed, 1 Oct 2014 21:38:42 +0000 (21:38 +0000)]
Merge "Throw error when no intent can be found" into lmp-dev
Patrick Tjin [Wed, 1 Oct 2014 17:13:44 +0000 (10:13 -0700)]
Skip over directories when iterating tombstones
Bug:
17380601
Change-Id: Idb6e559a89c7438751bd7a52375b9789454e0334
wsmlby [Wed, 1 Oct 2014 19:47:25 +0000 (12:47 -0700)]
Throw error when no intent can be found
bug:
17396762
Change-Id: I10502d5d1e2332d9e6820ee645234c125e937b7a
John Spurlock [Wed, 1 Oct 2014 20:17:34 +0000 (20:17 +0000)]
Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev
Winson Chung [Wed, 1 Oct 2014 20:03:18 +0000 (20:03 +0000)]
Merge "Ensure that we don't show excluded tasks when we are not in that task (Bug
17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug
17755902) - Tweaking previous changes to home transition - Disable the debug mode option" into lmp-dev
Jeff Hao [Fri, 28 Mar 2014 18:33:53 +0000 (11:33 -0700)]
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Needed to bypass new access checks for fields, methods, and
constructors.
Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
(cherry picked from commit
e3abd2ccbef4c50b48df3605c65d732fa49a980b)
Andreas Gampe [Wed, 1 Oct 2014 19:46:08 +0000 (19:46 +0000)]
Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev
Deepanshu Gupta [Fri, 19 Sep 2014 21:29:02 +0000 (14:29 -0700)]
Resource resolution bug fix. [DO NOT MERGE]
Fix a bug where "?attr/foo" in framework resources wasn't resolved
properly.
Change-Id: I9a56974f526774fde79685f668f01021136d68f1
(cherry picked from commit
19c7842082d831ad432abe906f4c37c6ed08e414)
Deepanshu Gupta [Fri, 19 Sep 2014 18:48:58 +0000 (11:48 -0700)]
Fix Tests after cherry picks. [DO NOT MERGE]
1. Updated the intelliJ run configuration for the layoutlib_create tool.
2. Updated the code to search for the platform.dir.
3. Update tests to use AppTheme and Target SDK 19
Change-Id: I6f1cc6ff2a53e4474c746537029c7f89c6dd6dc1
(cherry picked from commit
8592eeafd01370d1a17e34602290becf7f611c75)
Deepanshu Gupta [Wed, 13 Aug 2014 19:30:40 +0000 (12:30 -0700)]
Update intelliJ copyright profile [DO NOT MERGE]
Change-Id: Ib9386b686cb24e1f187d0b636b59b4b13d59bbcd
(cherry picked from commit
91fa62ac67a5e294124b5bfb70b35addc7687c34)
Deepanshu Gupta [Tue, 9 Sep 2014 01:38:57 +0000 (18:38 -0700)]
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
LayoutLib Create tests are now built whenever LayoutLib create is built.
Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
(cherry picked from commit
4efe6264f1251fa200427f54ea6f5dd4c4d03665)
Deepanshu Gupta [Fri, 5 Sep 2014 02:07:40 +0000 (19:07 -0700)]
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Add the layoutlib and layoutlib-create tests to DIST_DIR for sdk
targets. These can be used for continuous testing on the build server.
Change-Id: I747dddcddfd8009937668bec4d75cb99bf63235f
(cherry picked from commit
f9c749c9901c459f77ffc6f4fbbc15f4142c6e0a)
Deepanshu Gupta [Wed, 3 Sep 2014 19:57:12 +0000 (12:57 -0700)]
Build layoutlib_create tests. [DO NOT MERGE]
Change-Id: Ia13a090f8ec29b2b2a107825b6a13d7db77e6d61
(cherry picked from commit
2294f939bc79ce902a40db37def64cc28394d56b)
Deepanshu Gupta [Mon, 25 Aug 2014 18:49:02 +0000 (11:49 -0700)]
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
The variable is not actually needed and it makes working with different
API levels a lot easier since everything now depends on $PROJECT_DIR$.
This change also makes the tests more robust by improving the way it
tries to find the SDK.
Change-Id: I3502ad4a0ba85fd88b497e47964fddb2a89e520c
(cherry picked from commit
5377695d4ecf3cc6dc1abe59bbfca63f6137b722)
Deepanshu Gupta [Mon, 4 Aug 2014 21:01:07 +0000 (14:01 -0700)]
Get filename from File faster [DO NOT MERGE]
Use the direct call from a File object to get the filename instead of
going through Path which depends on Java 7 making the LayoutLib tests
incompatible with Java 6.
Change-Id: I815895eedbc10245ee09bdb53b11e5548b076aad
(cherry picked from commit
7dbf91fee96790fbeb9858740be1bb375f29ecb5)
Deepanshu Gupta [Thu, 31 Jul 2014 18:32:25 +0000 (11:32 -0700)]
Add testing framework to LayoutLib. [DO NOT MERGE]
This change adds an end to end test which loads the framework resources
and a test app and ensures that no exceptions or warnings are thrown.
The change also adds project configuration for intelliJ.
Change-Id: I7b67c0f1a2af2dac95df7f3231cab537b9826d7d
(cherry picked from commit
a8e9517470869fa29946ae1fa1ceeb24c7970391)
Deepanshu Gupta [Thu, 27 Feb 2014 19:51:50 +0000 (11:51 -0800)]
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Specify the test folder in the layoutlib/bridge eclipse project.
Also add the sourcepath for layoutlib-api-prebuilt.jar
Change-Id: I194ed182618e564388d6df645e2de7f59897fa1e
(cherry picked from commit
36acf8baebc9ab72b3b5fe75d865399ddf7b0132)
John Spurlock [Wed, 1 Oct 2014 19:32:22 +0000 (15:32 -0400)]
Doze: Route volume keys to music only while pulsing.
Avoid waking up the device on hw vol key presses during a doze
pulse. Instead, behave as if the screen was off for these keys,
namely forwarding them over to the session manager.
Bug:
17672775
Change-Id: I566b93f0bdea79253ac3eca41d3876b271c61306
John Reck [Wed, 1 Oct 2014 19:11:02 +0000 (19:11 +0000)]
Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev
Adam Powell [Wed, 1 Oct 2014 18:31:55 +0000 (18:31 +0000)]
Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
Hui Shu [Wed, 1 Oct 2014 18:28:56 +0000 (18:28 +0000)]
Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
Adam Powell [Wed, 1 Oct 2014 18:11:18 +0000 (18:11 +0000)]
Revert "Fix issue with using locally defined attrs in a shared lib"
This reverts commit
5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.
The reverted commit caused issues loading resources supplied by static libraries.
Bug
17748356
Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
Justin Koh [Wed, 1 Oct 2014 18:00:45 +0000 (18:00 +0000)]
am
37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '
37185d90a2036ece55991f416fcf7948a2198d97':
DO NOT MERGE Hide the volume panel for watches for now
Justin Koh [Wed, 1 Oct 2014 17:57:58 +0000 (17:57 +0000)]
Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
kmccormick [Wed, 1 Oct 2014 17:55:43 +0000 (17:55 +0000)]
am
d1ba4c13: am
ae3bd63b: am
a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '
d1ba4c13d0928d10c467bd7fd5992186925e1a5a':
Doc update: Update preprod (staging) instructions.
Justin Koh [Wed, 1 Oct 2014 17:42:33 +0000 (10:42 -0700)]
DO NOT MERGE Hide the volume panel for watches for now
Hide the volume panel: it's not usable. Need new design in a future release.
Bug:
17753651
Change-Id: I6f7b0683908407b2c1457379cc6641d25adc5c83
Ihab Awad [Wed, 1 Oct 2014 17:50:48 +0000 (17:50 +0000)]
Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev
Craig Mautner [Wed, 1 Oct 2014 17:48:12 +0000 (17:48 +0000)]
Merge "Don't clear visible-behind activity if it is top" into lmp-dev
Winson Chung [Mon, 29 Sep 2014 20:16:05 +0000 (13:16 -0700)]
Ensure that we don't show excluded tasks when we are not in that task (Bug
17657618)
- Fix regression with launching an affiliated task due to clipping changes (Bug
17755902)
- Tweaking previous changes to home transition
- Disable the debug mode option
John Reck [Wed, 1 Oct 2014 17:38:07 +0000 (10:38 -0700)]
Re-allow suppressing onDetachedFromWindow
Bug:
17578553
Games seem to be doing this to prevent destruction of their
GL contexts, and they assume it works even if it doesn't. However,
GLSurfaceView is clunky here, so while the app is doing something
questionable we don't really offer a better way. For now revert
back to kitkat behavior.
Change-Id: Icfa9e496279b9cfa47f9bc7f6848d9313caed0d5
kmccormick [Wed, 1 Oct 2014 17:25:38 +0000 (17:25 +0000)]
am
ae3bd63b: am
a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '
ae3bd63bc5ef8106a0d1c2ac15d872517bded5c3':
Doc update: Update preprod (staging) instructions.
Craig Mautner [Wed, 1 Oct 2014 16:38:40 +0000 (09:38 -0700)]
Don't clear visible-behind activity if it is top
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.
This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.
Fixes bug
17648436.
Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
kmccormick [Wed, 1 Oct 2014 17:08:13 +0000 (17:08 +0000)]
am
a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '
a1572ffc6b8df1f0da637fdb93b949322fcb3637':
Doc update: Update preprod (staging) instructions.
kmccormick [Wed, 1 Oct 2014 17:02:25 +0000 (17:02 +0000)]
Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
Selim Cinek [Wed, 1 Oct 2014 16:43:05 +0000 (16:43 +0000)]
Merge "Adapting translation length for a string in a dialog" into lmp-dev
Baligh Uddin [Wed, 1 Oct 2014 16:35:12 +0000 (16:35 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
John Spurlock [Wed, 1 Oct 2014 13:19:43 +0000 (09:19 -0400)]
Zen: Fix new event category check.
Allow events through if configured, and use a switch
for separating mode-specific logic.
Bug:
17580878
Change-Id: Id7b5d8b50173015d6a78568ed0a90e0bccf98549
Selim Cinek [Tue, 30 Sep 2014 17:47:33 +0000 (19:47 +0200)]
Adapting translation length for a string in a dialog
Bug:
17344905
Change-Id: Id95bdfea30c8ffd86a44cfa259cf5417abb09528
Narayan Kamath [Wed, 1 Oct 2014 09:53:32 +0000 (09:53 +0000)]
Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev
Baligh Uddin [Wed, 1 Oct 2014 04:25:41 +0000 (04:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Brian Carlstrom [Wed, 1 Oct 2014 04:21:25 +0000 (04:21 +0000)]
Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev
Ricardo Cervera [Wed, 1 Oct 2014 03:15:45 +0000 (03:15 +0000)]
am
e906b38b: am
781c988a: am
ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '
e906b38b7e692d05cf57ce12aabcb103a9a8b775':
docs: ADT beginner text fix