OSDN Git Service
Jae Seo [Wed, 16 Apr 2014 00:40:23 +0000 (17:40 -0700)]
Log watched TV programs
Change-Id: Id6ee87dffcf90f10f1619e849126c66ad27464e2
Chris Craik [Sat, 26 Apr 2014 01:58:59 +0000 (01:58 +0000)]
Merge "Support Oval GradientDrawable outlines, and ShapeDrawable"
Wink Saville [Sat, 26 Apr 2014 00:28:56 +0000 (00:28 +0000)]
am
c79963c3: am
1c1827a6: am
3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit '
c79963c3cb6d0127e2fc9ce5bf000fa05811504d':
Telephony: Add functionality to handle ICC IO error
Jim Miller [Sat, 26 Apr 2014 00:28:43 +0000 (00:28 +0000)]
Merge "Add new DevicePolicyManager disable flags for keyguard."
Wink Saville [Sat, 26 Apr 2014 00:25:44 +0000 (00:25 +0000)]
am
1c1827a6: am
3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit '
1c1827a6402c3a1f38ba077289a9022f6e6d3f73':
Telephony: Add functionality to handle ICC IO error
Wink Saville [Sat, 26 Apr 2014 00:20:02 +0000 (00:20 +0000)]
am
3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit '
3f4867f49d6c1932117e3519ce10d11f37829f19':
Telephony: Add functionality to handle ICC IO error
Wink Saville [Fri, 25 Apr 2014 23:58:11 +0000 (23:58 +0000)]
Merge "Telephony: Add functionality to handle ICC IO error"
Vince Harron [Fri, 25 Apr 2014 23:28:10 +0000 (23:28 +0000)]
am
165b965e: am
4f50911a: am
e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Rem
* commit '
165b965edb42460ef9b0add89a76a311c707a1e2':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
Vince Harron [Fri, 25 Apr 2014 23:25:11 +0000 (23:25 +0000)]
am
4f50911a: am
e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that
* commit '
4f50911aa18f9d4650c6721456dd05ac499fcefd':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
Vince Harron [Fri, 25 Apr 2014 23:22:07 +0000 (23:22 +0000)]
am
e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don\'t allocat
* commit '
e9a4e9deaad6a3185269bf5696c2a2946962fbd2':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
Vince Harron [Fri, 25 Apr 2014 23:17:36 +0000 (23:17 +0000)]
Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-ub-dev
Amith Yamasani [Fri, 25 Apr 2014 23:04:26 +0000 (23:04 +0000)]
Merge "Handle density request in LauncherActivityInfo"
Chris Craik [Fri, 25 Apr 2014 20:08:25 +0000 (13:08 -0700)]
Support Oval GradientDrawable outlines, and ShapeDrawable
Change-Id: Ifc9e55757d3325cb28a1a812ec696512d4a18b39
Ricardo Cervera [Fri, 25 Apr 2014 22:59:36 +0000 (22:59 +0000)]
am
9d7c58cf: am
6fe328c6: am
86afa0b5: am
039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
* commit '
9d7c58cf8b609e5eda1c7d4df252a723b2dd5c23':
docs: Added release notes for ADT 22.6.3
Amith Yamasani [Fri, 25 Apr 2014 22:56:26 +0000 (15:56 -0700)]
Handle density request in LauncherActivityInfo
Change-Id: I4e8dc8ef1454b3881bdb80ae118e2d0d306642f3
Mark Salyzyn [Fri, 25 Apr 2014 22:52:09 +0000 (22:52 +0000)]
am
a19b9c41: am
dfdeabf9: am
ac732708: Merge "EventLog: event log translation errors"
* commit '
a19b9c413b3e7f3b6038b06c51d01bab1e0bfda9':
EventLog: event log translation errors
Ricardo Cervera [Fri, 25 Apr 2014 22:37:45 +0000 (22:37 +0000)]
am
6fe328c6: am
86afa0b5: am
039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
* commit '
6fe328c62abd3b98aceeeb99aaf5d824bd42adc6':
docs: Added release notes for ADT 22.6.3
Ricardo Cervera [Fri, 25 Apr 2014 22:33:25 +0000 (22:33 +0000)]
am
86afa0b5: am
039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
* commit '
86afa0b56bf8af0a2c94fcabf5eb7f64f6c66c2d':
docs: Added release notes for ADT 22.6.3
Ricardo Cervera [Fri, 25 Apr 2014 22:21:10 +0000 (22:21 +0000)]
am
039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
* commit '
039bd50825f7ea8b706c8ea6e54a1c893759309d':
docs: Added release notes for ADT 22.6.3
Ricardo Cervera [Fri, 25 Apr 2014 22:15:28 +0000 (22:15 +0000)]
Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
Craig Mautner [Fri, 25 Apr 2014 22:10:12 +0000 (22:10 +0000)]
am
cb48b962: am
1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev
* commit '
cb48b96223071dc9d8633aab8f6cd9a91b3676bf':
Throw exception from startActivity if not allowed.
Kenny Root [Fri, 25 Apr 2014 22:09:25 +0000 (22:09 +0000)]
Merge "PackageManager: add versioning to packages.xml file"
Mark Salyzyn [Fri, 25 Apr 2014 22:07:07 +0000 (22:07 +0000)]
am
dfdeabf9: am
ac732708: Merge "EventLog: event log translation errors"
* commit '
dfdeabf9ba40ea7f082acf7eba6fe086d2e643fb':
EventLog: event log translation errors
Mark Salyzyn [Fri, 25 Apr 2014 22:03:20 +0000 (22:03 +0000)]
am
ac732708: Merge "EventLog: event log translation errors"
* commit '
ac7327082c411617f7937b87575c117bd63ad9df':
EventLog: event log translation errors
Mark Salyzyn [Fri, 25 Apr 2014 21:59:18 +0000 (21:59 +0000)]
Merge "EventLog: event log translation errors"
Adam Powell [Fri, 25 Apr 2014 21:34:32 +0000 (21:34 +0000)]
Merge "Fix ScrollView nested scrolling with touch down on buttons"
destradaa [Fri, 25 Apr 2014 21:21:37 +0000 (21:21 +0000)]
Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/
14118906"
Adam Powell [Fri, 25 Apr 2014 21:21:27 +0000 (14:21 -0700)]
Fix ScrollView nested scrolling with touch down on buttons
Start ScrollView's nested scroll in onIntercept to signal nested
scrolling parents not to intercept along the vertical axis.
Change-Id: Ieb343ff6b8216b113d3876bf93a804e609257f2a
Mark Salyzyn [Fri, 25 Apr 2014 20:25:18 +0000 (13:25 -0700)]
EventLog: event log translation errors
- Deal with L using v3 event log format, or K using v1 or v2 event log format
Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
Kenny Guy [Fri, 25 Apr 2014 20:28:13 +0000 (20:28 +0000)]
Merge "Provide access to ActivityInfo.name from LauncherActivityInfo"
Jim Miller [Thu, 24 Apr 2014 00:25:00 +0000 (17:25 -0700)]
Add new DevicePolicyManager disable flags for keyguard.
- KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
- KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS
- KEYGUARD_DISABLE_TRUST_AGENTS
Change-Id: I4ed2b9cef78b497d87bb719c57fabdad94c18e82
Adam Lesinski [Fri, 25 Apr 2014 20:25:24 +0000 (20:25 +0000)]
Merge "Child nodes of <preference-headers> now output proguard keep options."
Winson Chung [Fri, 25 Apr 2014 20:22:31 +0000 (20:22 +0000)]
Merge "Updating recent tasks list in response to package events. (Bug
14260718)"
Kenny Guy [Fri, 25 Apr 2014 19:48:32 +0000 (20:48 +0100)]
Provide access to ActivityInfo.name from LauncherActivityInfo
Change-Id: Ia34900f3e232b59f3879dbb3cb3131498023b8ac
Zhijun He [Fri, 25 Apr 2014 19:44:20 +0000 (19:44 +0000)]
Merge "ImageReader: remove RAW_SENSOR format translation"
John Spurlock [Fri, 25 Apr 2014 18:53:16 +0000 (18:53 +0000)]
Merge "Delay settings panel visibility until touch slop exceeded."
Craig Mautner [Fri, 25 Apr 2014 18:45:06 +0000 (18:45 +0000)]
am
1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev
* commit '
1a7e9e66a6de039da8f567a2087d9bce34820746':
Throw exception from startActivity if not allowed.
Craig Mautner [Fri, 25 Apr 2014 18:39:46 +0000 (18:39 +0000)]
Merge "Throw exception from startActivity if not allowed." into klp-modular-dev
destradaa [Fri, 25 Apr 2014 18:37:52 +0000 (11:37 -0700)]
Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.
b/
14118906
Change-Id: I4723a3b9cad99aacc70bd3b7b5b5e034aa6c033d
Adam Lesinski [Fri, 25 Apr 2014 18:36:02 +0000 (11:36 -0700)]
Child nodes of <preference-headers> now output proguard keep options.
Bug:
13797600
Change-Id: I55c71a2fcf7f9b4bdad684d5c235981c3a8bc1e9
Amith Yamasani [Fri, 25 Apr 2014 18:23:36 +0000 (18:23 +0000)]
Merge "Allow profile owners to set user restrictions"
Craig Mautner [Fri, 25 Apr 2014 17:09:00 +0000 (10:09 -0700)]
Throw exception from startActivity if not allowed.
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.
This fix checks the attribute at the time ActivityView.startActivity
is called.
Fixes bug
14317210.
Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
John Spurlock [Fri, 25 Apr 2014 18:19:06 +0000 (18:19 +0000)]
Merge "Introduce condition provider services."
Winson Chung [Thu, 24 Apr 2014 20:06:49 +0000 (13:06 -0700)]
Updating recent tasks list in response to package events. (Bug
14260718)
Change-Id: I7e887256b2d504aebfaedcfebb5ee8a40b05fe24
Yuling Liang [Fri, 25 Apr 2014 17:38:00 +0000 (17:38 +0000)]
am
69a9d925: am
eea94f06: Merge "Revert "Followon fix for
14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit '
69a9d92502428a4cf6eb6b5bf6577d9e525796a2':
Revert "Followon fix for
14276128 Clipping at bottom of TextView"
Yuling Liang [Fri, 25 Apr 2014 17:35:52 +0000 (17:35 +0000)]
am
eea94f06: Merge "Revert "Followon fix for
14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit '
eea94f060a917a5c6195a81d8825551a430a8d69':
Revert "Followon fix for
14276128 Clipping at bottom of TextView"
Yuling Liang [Fri, 25 Apr 2014 17:32:28 +0000 (17:32 +0000)]
Merge "Revert "Followon fix for
14276128 Clipping at bottom of TextView"" into klp-modular-dev
Yuling Liang [Fri, 25 Apr 2014 17:32:08 +0000 (17:32 +0000)]
Revert "Followon fix for
14276128 Clipping at bottom of TextView"
This reverts commit
a10e19845ce76c0e4dd38018c84b83c9255dc9fe.
Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
Alexandra Gherghina [Fri, 25 Apr 2014 17:12:43 +0000 (17:12 +0000)]
Merge "Temporarily switch off returning only enabled profiles to support dogfooding"
Alexandra Gherghina [Fri, 25 Apr 2014 15:42:11 +0000 (16:42 +0100)]
Temporarily switch off returning only enabled profiles to support dogfooding
Bug:
14132551
Change-Id: I3679c8fc248a799c816e5b80641b1fca6b7af061
Dianne Hackborn [Fri, 25 Apr 2014 17:02:18 +0000 (17:02 +0000)]
Merge "Initial implementation of new voice interaction API."
Allen Hair [Fri, 25 Apr 2014 16:59:20 +0000 (16:59 +0000)]
Merge "Fix nativeGetAnimationFrameStats to use the correct times."
Allen Hair [Fri, 25 Apr 2014 16:57:34 +0000 (16:57 +0000)]
Merge "Fixed shell manifest to use correct permission."
Selim Gurun [Fri, 25 Apr 2014 16:44:10 +0000 (16:44 +0000)]
Merge "Clarify a use case."
Yuling Liang [Fri, 25 Apr 2014 16:41:07 +0000 (16:41 +0000)]
am
60f8349b: am
243e551a: Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
60f8349b9819130e81e28106a35bf3362d337045':
Followon fix for
14276128 Clipping at bottom of TextView
Selim Gurun [Fri, 25 Apr 2014 16:39:31 +0000 (09:39 -0700)]
Clarify a use case.
Clarify a use case regarding clearing client certificates.
Change-Id: Ifdfa00022bb21b26e6f62dbad585faef4f8fc3c7
John Spurlock [Thu, 24 Apr 2014 22:50:12 +0000 (18:50 -0400)]
Introduce condition provider services.
Add the condition provider interface, base class, and associated
system metadata.
Pull out common service management code into a reusable helper,
used by notification listeners and condition providers. The
helper, ManagedServices, is now completely self-contained - it
has no dependencies on NoMan or NoMan abstractions.
Bug:
13743109
Change-Id: I6856d40f0a2ead78ac9b5707568559a57e7eb009
Yuling Liang [Fri, 25 Apr 2014 16:34:15 +0000 (16:34 +0000)]
am
243e551a: Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
243e551ac380f86639eee3e95a482d8e17836670':
Followon fix for
14276128 Clipping at bottom of TextView
Yuling Liang [Fri, 25 Apr 2014 16:30:12 +0000 (16:30 +0000)]
Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
Chris Craik [Fri, 25 Apr 2014 16:22:26 +0000 (16:22 +0000)]
Merge "Refactor Drawable outline production, flesh out Outline methods"
John Spurlock [Fri, 25 Apr 2014 14:16:27 +0000 (10:16 -0400)]
Delay settings panel visibility until touch slop exceeded.
Bug:
14271219
Change-Id: Ic8f36670f8d56f74a383ca7a867b69c7568a7250
Kenny Root [Thu, 24 Apr 2014 20:36:40 +0000 (13:36 -0700)]
PackageManager: add versioning to packages.xml file
During development, a new feature might be added that requires the
packages.xml format be updated. To that end, add a database version
attribute that allows this to happen.
Change-Id: I3340a0bd55017acd625c3cba523cec10a18a4805
Marco Nelissen [Fri, 25 Apr 2014 14:55:11 +0000 (14:55 +0000)]
am
ebd6a2d2: am
eded9e3b: am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
ebd6a2d2710ebf7196a399d6d5a2f0745844310b':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:52:18 +0000 (14:52 +0000)]
am
eded9e3b: am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
eded9e3b7f6f30526365461a25624b841611af28':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:46:35 +0000 (14:46 +0000)]
am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
adcf38c9936fa372309d413cec03a1413e797c7a':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:42:02 +0000 (14:42 +0000)]
Merge "Release DrmManagerClient resources"
Jungshik Jang [Fri, 25 Apr 2014 14:09:17 +0000 (14:09 +0000)]
Merge "Implement skeleton of new HDMI Control Service."
Jorim Jaggi [Fri, 25 Apr 2014 13:13:11 +0000 (13:13 +0000)]
Merge "Attempt to fix blank lockscreen."
Jorim Jaggi [Fri, 25 Apr 2014 12:56:15 +0000 (14:56 +0200)]
Attempt to fix blank lockscreen.
Bug:
14280857
Change-Id: Icf458040b1a0b0a412981acf7b522d04c046a5f8
Colin Cross [Fri, 25 Apr 2014 05:45:05 +0000 (22:45 -0700)]
fix build
When commit
4e48f40b0384110082bec52caf38d2d47ce505f5 merged from
AOSP it added a hunk that was already present. Remove the second
copy.
Change-Id: I48b30fd5fe21d6668cc904744fed7d5044fae91d
Craig Mautner [Fri, 25 Apr 2014 03:10:13 +0000 (03:10 +0000)]
am
e5889679: am
3a656ea3: Merge "Too soon." into klp-modular-dev
* commit '
e5889679f69c93f85bca9e94710d5e60a0b1a629':
Too soon.
Craig Mautner [Fri, 25 Apr 2014 03:06:34 +0000 (03:06 +0000)]
am
3a656ea3: Merge "Too soon." into klp-modular-dev
* commit '
3a656ea32e6d6489f4bc45884e5acede9fe2de51':
Too soon.
Craig Mautner [Fri, 25 Apr 2014 03:03:37 +0000 (03:03 +0000)]
Merge "Too soon." into klp-modular-dev
Craig Mautner [Fri, 25 Apr 2014 03:01:40 +0000 (03:01 +0000)]
Too soon.
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
Elliott Hughes [Fri, 25 Apr 2014 02:06:39 +0000 (02:06 +0000)]
Merge "Track package change."
Elliott Hughes [Fri, 25 Apr 2014 02:05:43 +0000 (19:05 -0700)]
Track package change.
Change-Id: I6a8123d8e69367fc1ce27bac46c4bcec489d73ba
Selim Gurun [Fri, 25 Apr 2014 01:19:31 +0000 (01:19 +0000)]
am
7466e3bb: am
e3fc3073: am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
7466e3bbbd13b563e1a5adcc537ea0f132045038':
Add a stub for forgotten callback to fix master-gpl.
Selim Gurun [Fri, 25 Apr 2014 01:15:36 +0000 (01:15 +0000)]
am
e3fc3073: am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
e3fc3073826b4fdfa0d1be17fe0c79ccf211ad7d':
Add a stub for forgotten callback to fix master-gpl.
Selim Gurun [Fri, 25 Apr 2014 01:12:46 +0000 (01:12 +0000)]
am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
8c2d70f5e8dfe64213f44c29562fe4240779b68b':
Add a stub for forgotten callback to fix master-gpl.
Ruben Brunk [Fri, 25 Apr 2014 01:10:07 +0000 (01:10 +0000)]
Merge "camera2: Add DNG creator class."
Selim Gurun [Fri, 25 Apr 2014 01:08:48 +0000 (01:08 +0000)]
Merge "Add a stub for forgotten callback to fix master-gpl."
Selim Gurun [Fri, 25 Apr 2014 01:04:04 +0000 (18:04 -0700)]
Add a stub for forgotten callback to fix master-gpl.
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
Selim Gurun [Fri, 25 Apr 2014 00:52:37 +0000 (00:52 +0000)]
am
a6972684: am
f7a19173: am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
a697268442a68fef255863f0a8a0fa1a610dc340':
Add a stub to fix master-gpl
Dianne Hackborn [Sat, 5 Apr 2014 01:02:06 +0000 (18:02 -0700)]
Initial implementation of new voice interaction API.
This gives a basic working implementation of a persist
running service that can start a voice interaction when
it wants, with the target activity(s) able to go through
the protocol to interact with it. It may even work when
the screen is off by putting the activity manager in the
correct state to act like the screen is on.
Includes a sample app that is a voice interation service
and also has an activity it can launch.
Now that I have this initial implementation, I think I
want to rework some aspects of the API.
Change-Id: I7646d0af8fb4ac768c63a18fe3de43f8091f60e9
Selim Gurun [Fri, 25 Apr 2014 00:47:23 +0000 (00:47 +0000)]
am
f7a19173: am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
f7a191731f6c840eed9283652648f267589502c2':
Add a stub to fix master-gpl
Craig Mautner [Fri, 25 Apr 2014 00:44:56 +0000 (00:44 +0000)]
am
fbb0796e: am
3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
* commit '
fbb0796eb3bbbdfeb3218b9495a0f36f4cf4ed19':
Add test for attribute android:allowEmbedded
Craig Mautner [Fri, 25 Apr 2014 00:42:25 +0000 (00:42 +0000)]
am
3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
* commit '
3359bbe02ca645bae2f495df51e7b4001de6c2b1':
Add test for attribute android:allowEmbedded
Selim Gurun [Fri, 25 Apr 2014 00:41:59 +0000 (00:41 +0000)]
am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
adad989b6a2c736f427526e747dcb89ed9762bab':
Add a stub to fix master-gpl
Selim Gurun [Fri, 25 Apr 2014 00:39:09 +0000 (00:39 +0000)]
Merge "Add a stub to fix master-gpl"
Craig Mautner [Fri, 25 Apr 2014 00:39:05 +0000 (00:39 +0000)]
Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
Selim Gurun [Fri, 25 Apr 2014 00:29:55 +0000 (17:29 -0700)]
Add a stub to fix master-gpl
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
Christopher Tate [Fri, 25 Apr 2014 00:26:05 +0000 (00:26 +0000)]
Merge "Send factory reset notification broadcasts at foreground priority"
Elliott Hughes [Fri, 25 Apr 2014 00:18:10 +0000 (17:18 -0700)]
resolved conflicts for merge of
02e85744 to master
Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
Elliott Hughes [Thu, 24 Apr 2014 23:59:05 +0000 (23:59 +0000)]
am
5f5ca3bc: am
31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '
5f5ca3bc98fb773ee905289300595ad95d5ffabe':
Use the suggested public API instead of libcore.os.
Chris Craik [Thu, 24 Apr 2014 02:40:28 +0000 (19:40 -0700)]
Refactor Drawable outline production, flesh out Outline methods
Change-Id: I1b8c25384b5f123e86cf5e0b2270eb741bc3159b
Elliott Hughes [Thu, 24 Apr 2014 23:55:09 +0000 (23:55 +0000)]
am
31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '
31a1dd2a8f56b439861ee335b55f44323318830c':
Use the suggested public API instead of libcore.os.
Elliott Hughes [Thu, 24 Apr 2014 23:52:16 +0000 (23:52 +0000)]
Merge "Use the suggested public API instead of libcore.os."
Andrew Solovay [Thu, 24 Apr 2014 23:48:57 +0000 (23:48 +0000)]
am
9a4db311: am
3cb4430b: am
27547e6d: am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
9a4db3114b1f3c5c682ee4c9c6f78651c5fc38b8':
Correcting name of 'Backup & reset' menu.
Andrew Solovay [Thu, 24 Apr 2014 23:45:09 +0000 (23:45 +0000)]
am
3cb4430b: am
27547e6d: am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
3cb4430b071e9e978853f73c0cccd15dc2f37a49':
Correcting name of 'Backup & reset' menu.
Dianne Hackborn [Thu, 24 Apr 2014 23:43:49 +0000 (23:43 +0000)]
Merge "Add support for muliple active development codenames."