OSDN Git Service
Deepanshu Gupta [Thu, 27 Feb 2014 19:51:50 +0000 (11:51 -0800)]
Add tests to the layoutlib eclipse project.
Specify the test folder in the layoutlib/bridge eclipse project.
Also add the sourcepath for layoutlib-api-prebuilt.jar
Change-Id: I194ed182618e564388d6df645e2de7f59897fa1e
John Spurlock [Thu, 27 Feb 2014 18:43:38 +0000 (18:43 +0000)]
Merge "Disable zen mode UI until provisioned."
John Spurlock [Thu, 27 Feb 2014 18:09:35 +0000 (13:09 -0500)]
Disable zen mode UI until provisioned.
Change-Id: Ib7fb9a793176ec38c4958dba7ee546ee1f47fba1
Derek Sollenberger [Thu, 27 Feb 2014 18:09:30 +0000 (18:09 +0000)]
Merge "Cleanup unnecessary includes for libskia."
Mike Lockwood [Thu, 27 Feb 2014 18:04:37 +0000 (18:04 +0000)]
Merge "Add support for USB devices with multiple configurations and alternate interfaces"
Mike Lockwood [Mon, 13 Jan 2014 18:31:01 +0000 (10:31 -0800)]
Add support for USB devices with multiple configurations and alternate interfaces
Added UsbConfiguration class, as well as accessors to UsbDevice to get configuration list
Added methods to UsbDeviceConnection to select configurations and alternate interfaces.
Also added accessors for USB descriptor name strings and fixed some memory leaks in the JNI code.
Bug:
12425052
Change-Id: Idb990f4d5c054a8cb997eb3f440f6da9f83bce05
George Mount [Thu, 27 Feb 2014 17:43:46 +0000 (17:43 +0000)]
Merge "Fix broken link in javadoc."
George Mount [Thu, 27 Feb 2014 17:41:39 +0000 (09:41 -0800)]
Fix broken link in javadoc.
Change-Id: I8df3713af727a123bcf9743e59e5f7fe661350ec
John Spurlock [Thu, 27 Feb 2014 17:29:54 +0000 (17:29 +0000)]
Merge "Introduce zen mode."
Chris Wren [Thu, 27 Feb 2014 17:03:42 +0000 (17:03 +0000)]
Merge "improvements to heads up interface"
John Spurlock [Thu, 13 Feb 2014 17:52:19 +0000 (12:52 -0500)]
Introduce zen mode.
- New global zen mode setting with three values:
ZEN_MODE_OFF, ZEN_MODE_LIMITED, ZEN_MODE_FULL
- Status bar icon (on lhs) when in _LIMITED / _FULL
- Rules are hardcoded for now:
_LIMITED = intercept all notifications except calls/alarms
_FULL = intercept everything
- UI affordance in shade to set mode
- Only one exit condition: "Until you delete this"
- Intercepted notifications:
- appear darker in the shade
- do not cause sound/vibration
- do not fire fullScreenIntents
- do not contribute an icon to the status bar
Change-Id: Ic36c95982b483432006bf9dab102a31370382aa9
Chris Wren [Tue, 25 Feb 2014 23:02:13 +0000 (18:02 -0500)]
improvements to heads up interface
remove shadow
quick hack to open shade from HUN
over status bar instead of under and below it
dismiss by pushing up
tablets: shadow remains on left, right, and bottom
Bug:
13208692
Change-Id: Ie3abb762fb1388be68353c7e3111fe4708ab8110
Derek Sollenberger [Thu, 27 Feb 2014 16:14:55 +0000 (11:14 -0500)]
Cleanup unnecessary includes for libskia.
The libskia target exports all of its public includes directories so
redefining them here is redundant. Also this cleans up and makes it
obvious where the framework is making using of private Skia headers.
Change-Id: Ie7ecc9ddd3df780bed6b9af54ba58ca58274e043
George Mount [Thu, 27 Feb 2014 15:15:05 +0000 (15:15 +0000)]
Merge "Change Activity Scene Transitions to be more automatic redo."
Nicolas Prevot [Thu, 27 Feb 2014 14:47:56 +0000 (14:47 +0000)]
Merge "Correcting a deadlock in CreateRelatedUser"
Nicolas Prevot [Thu, 27 Feb 2014 13:11:09 +0000 (13:11 +0000)]
Correcting a deadlock in CreateRelatedUser
A deadlock sometimes happened in CreateRelatedUser of UserManagerService.
A lock was kept when it should have been released.
Change-Id: I15444c0b5d0d5d1e14e7bf29c2115aa954b7dfc0
Narayan Kamath [Thu, 27 Feb 2014 13:33:23 +0000 (13:33 +0000)]
am
7aec4109: am
7aeb4307: am
2525acf5: am
e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '
7aec4109c53371e69bec111c69767810f45c301c':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Narayan Kamath [Thu, 27 Feb 2014 13:30:08 +0000 (13:30 +0000)]
am
7aeb4307: am
2525acf5: am
e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '
7aeb43072a9fb9b0a7078a390cb4a729321bf117':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Narayan Kamath [Thu, 27 Feb 2014 13:26:39 +0000 (13:26 +0000)]
am
2525acf5: am
e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '
2525acf5a9855d748c008268bb26d6f6d5045d84':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Narayan Kamath [Thu, 27 Feb 2014 13:25:43 +0000 (13:25 +0000)]
am
2589067d: am
9fc8e6fe: am
f61add84: am
2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit '
2589067d10b5f6a67eb1f789b4cf5943914dd9d2':
Make getAssetInt throw unconditionally.
Narayan Kamath [Thu, 27 Feb 2014 13:22:36 +0000 (13:22 +0000)]
am
9fc8e6fe: am
f61add84: am
2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit '
9fc8e6fe8f6c89f5ebcda4b569cab10988e1fa3f':
Make getAssetInt throw unconditionally.
Narayan Kamath [Thu, 27 Feb 2014 13:20:52 +0000 (05:20 -0800)]
am
e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '
e4dae5f2c26f5992a31f8ce15811fc082647ddb8':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Narayan Kamath [Thu, 27 Feb 2014 13:19:15 +0000 (13:19 +0000)]
am
f61add84: am
2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit '
f61add84c28be06c190d5594a41a7ef84b7666fe':
Make getAssetInt throw unconditionally.
Narayan Kamath [Thu, 27 Feb 2014 13:18:06 +0000 (13:18 +0000)]
Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
Narayan Kamath [Thu, 27 Feb 2014 13:15:56 +0000 (05:15 -0800)]
am
2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit '
2000fe58332dffaad34c618fe35840992cb0f571':
Make getAssetInt throw unconditionally.
Narayan Kamath [Thu, 27 Feb 2014 13:13:08 +0000 (13:13 +0000)]
Merge "Make getAssetInt throw unconditionally."
Yohei Yukawa [Thu, 27 Feb 2014 08:10:00 +0000 (17:10 +0900)]
Add unit test for InputMethodInfo
This CL adds a unit test to make sure that InputMethodInfo
implements Parcelable correctly.
BUG:
12954290
Change-Id: I0abe8c266b4b035bf8ef4688d11069b355fabe9f
Baligh Uddin [Thu, 27 Feb 2014 04:34:35 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 27 Feb 2014 04:34:30 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Alan Viverette [Thu, 27 Feb 2014 03:49:44 +0000 (03:49 +0000)]
Merge "Always set item type on obtained ListView item views"
Yuhao Zheng [Thu, 27 Feb 2014 03:12:06 +0000 (03:12 +0000)]
Merge "Add new API to scan a given channel set"
Jeff Brown [Thu, 27 Feb 2014 02:42:30 +0000 (02:42 +0000)]
am
ba61962b: (-s ours) am
71e21fec: am
6ca90042: Add touch.wake IDC property to control wakeup.
* commit '
ba61962b3308881e6200870c8d6420b81c6f9225':
Add touch.wake IDC property to control wakeup.
Alan Viverette [Thu, 27 Feb 2014 02:16:36 +0000 (18:16 -0800)]
Always set item type on obtained ListView item views
If a view is scrapped without layout params being set, it will
incorrectly be recycled as item type 0.
BUG:
13212603
Change-Id: I2a42c04ec5065067ab260a0a8afb07207db729f6
Jeff Brown [Thu, 27 Feb 2014 02:02:22 +0000 (02:02 +0000)]
am
71e21fec: am
6ca90042: Add touch.wake IDC property to control wakeup.
* commit '
71e21fec61d17b41a3f0ed817bfa2ae5fb357212':
Add touch.wake IDC property to control wakeup.
Jeff Brown [Thu, 27 Feb 2014 01:59:02 +0000 (01:59 +0000)]
am
6ca90042: Add touch.wake IDC property to control wakeup.
* commit '
6ca90042b398153e063cf69dea784e201e76a9ee':
Add touch.wake IDC property to control wakeup.
Alan Viverette [Thu, 27 Feb 2014 01:20:10 +0000 (17:20 -0800)]
Restore getTintMode() method on BitmapDrawable
Change-Id: I8fffc90ce3f0811d75b517d2dfc71de731188da6
Alan Viverette [Thu, 27 Feb 2014 00:48:54 +0000 (16:48 -0800)]
Clean up tint API
Change-Id: I56056e7596840c563f5332922d63e8893a0cac17
Alan Viverette [Thu, 27 Feb 2014 00:27:05 +0000 (00:27 +0000)]
Merge "Fix shape drawable constructor"
Alan Viverette [Thu, 27 Feb 2014 00:26:33 +0000 (16:26 -0800)]
Fix shape drawable constructor
Change-Id: Ibb2c1993faf9d2baae3130f334475aa07fbe9015
Dianne Hackborn [Thu, 27 Feb 2014 00:17:59 +0000 (00:17 +0000)]
Merge "Collect per-uid mobile radio usage."
Wonsik Kim [Thu, 27 Feb 2014 00:07:39 +0000 (00:07 +0000)]
Merge "VideoPlaneView initial implementation"
Dianne Hackborn [Wed, 26 Feb 2014 20:35:32 +0000 (12:35 -0800)]
Collect per-uid mobile radio usage.
We now compute radio active time per application, by distributing
the active time across all applications each time the radio goes
down, weighting it by the number of packets transferred.
Per-app radio power use is now computed using this radio active
time.
This also gives us a new metric "ms per packet", which give an
idea of how effectively an application is using the radio. This
is collected and reported as a new set of stats in the human-
readable checkin. (It can be computed from the raw checkin data).
Also improve sync reporting to include the sync source as used
in wake locks, not just the component name.
Change-Id: I0b0185fadd1e47ae749090ed36728ab78ac24c5e
Alan Viverette [Wed, 26 Feb 2014 23:38:51 +0000 (15:38 -0800)]
Fix progress bar tinting, add tint support to ShapeDrawable
Cleans up APIs a little, since I think we may want to add tinting
modes beyond what Porter-Duff can provide. Plus we don't actually
support some of the Porter-Duff modes in hardware.
Change-Id: I2cea1b737cc93607a24842c54eb9f0d8346b29d4
George Mount [Wed, 26 Feb 2014 19:00:52 +0000 (19:00 +0000)]
Change Activity Scene Transitions to be more automatic redo.
This reverts commit
206e30cd93afe3eb72ec94178324417db5424ed2
along with removing the additional startActivity* methods
and replaces them with ActivityOptions makeSceneTransitionAnimation
methods.
Change-Id: I52bec31ae3c4cea6d549810ae5a7acd8aea176d8
Jeff Brown [Wed, 26 Feb 2014 23:12:45 +0000 (15:12 -0800)]
Add touch.wake IDC property to control wakeup.
Normally we do not wake the device when the internal touch screen is
touched. This behavior can now be configured by setting a property
in the input device configuration file. Add the following line to
the IDC file to enable an initial touch to wake the device from sleep.
touch.wake = 1
Change-Id: Ifd6d4f51afacd30d85f475725a66e6fcccde9cbb
Chris Craik [Wed, 26 Feb 2014 21:28:34 +0000 (21:28 +0000)]
am
f85da425: (-s ours) Fix build - DO NOT MERGE
* commit '
f85da42512d5dd76a899097907974b48b887be60':
Fix build - DO NOT MERGE
Chris Craik [Wed, 26 Feb 2014 18:44:33 +0000 (10:44 -0800)]
Fix build - DO NOT MERGE
Change-Id: I1ab7c369082d1d2aa4f4ed11354c13ff86582410
Ying Wang [Wed, 26 Feb 2014 20:34:39 +0000 (20:34 +0000)]
Merge "Fix SDK build."
Ying Wang [Wed, 26 Feb 2014 20:33:46 +0000 (12:33 -0800)]
Fix SDK build.
Change-Id: Ic93a6d3e7b510aef2d66dc0dc2dad5af8e7648c5
Chris Craik [Wed, 26 Feb 2014 19:31:22 +0000 (19:31 +0000)]
am
4fecd0ae: (-s ours) am
74a8b916: am
59ff85af: (-s ours) am
2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE"
* commit '
4fecd0aeeb9a76b55c234a24cfd5e1394c801348':
Fix AOSP build - DO NOT MERGE
Chris Craik [Wed, 26 Feb 2014 19:31:16 +0000 (19:31 +0000)]
am
328b7ee6: am
aecb8c43: am
7b4cce68: am
c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"
* commit '
328b7ee6a2ba2dc8f162fa57dbafd4bfc89bb72e':
Fix graphics corruption caused by HWUI caches
Felipe Leme [Wed, 26 Feb 2014 19:22:52 +0000 (19:22 +0000)]
Merge "Added support for WiFi frequency on WifiInfo (getter, settter, and frequency constant). Bug:
12767819"
Chris Craik [Wed, 26 Feb 2014 19:14:35 +0000 (19:14 +0000)]
am
74a8b916: am
59ff85af: (-s ours) am
2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE"
* commit '
74a8b916aceb0b55a7fdfa63bd8267c50d952a28':
Fix AOSP build - DO NOT MERGE
Chris Craik [Wed, 26 Feb 2014 19:14:32 +0000 (19:14 +0000)]
am
aecb8c43: am
7b4cce68: am
c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"
* commit '
aecb8c43d0c6c3d2b55f88abeaa0e3197be59301':
Fix graphics corruption caused by HWUI caches
Chris Craik [Wed, 26 Feb 2014 19:10:44 +0000 (19:10 +0000)]
am
59ff85af: (-s ours) am
2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE"
* commit '
59ff85af314e2984068943f5572ac40ef381edea':
Fix AOSP build - DO NOT MERGE
Chris Craik [Wed, 26 Feb 2014 19:10:39 +0000 (19:10 +0000)]
am
7b4cce68: am
c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"
* commit '
7b4cce68853d8bcfce2b6bd7f999915063eb56d2':
Fix graphics corruption caused by HWUI caches
Jeff Davidson [Wed, 26 Feb 2014 19:10:05 +0000 (19:10 +0000)]
Merge "Fix SDK build broken by ag/423985"
Ashok Bhat [Wed, 26 Feb 2014 10:00:48 +0000 (10:00 +0000)]
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen
script
This will allow eglGetDisplay(int) to work on both 32-bit and
64-bit systems when EGL_DEFAULT_DISPLAY is passed as a parameter.
Change-Id: Idf27d6e00d623d331bb2d4d7f85fa450e0db26c9
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Chris Craik [Wed, 26 Feb 2014 19:06:30 +0000 (11:06 -0800)]
am
2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE"
* commit '
2729857df6c559b37248c96b78303b662212d14b':
Fix AOSP build - DO NOT MERGE
Chris Craik [Wed, 26 Feb 2014 19:06:27 +0000 (11:06 -0800)]
am
c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"
* commit '
c3bac8a096cc5661cf91c8c0aa9b7dd0fc099c5d':
Fix graphics corruption caused by HWUI caches
Chris Craik [Wed, 26 Feb 2014 18:48:27 +0000 (18:48 +0000)]
Merge "Fix AOSP build - DO NOT MERGE"
Chris Craik [Wed, 26 Feb 2014 18:47:59 +0000 (18:47 +0000)]
Merge "Fix graphics corruption caused by HWUI caches"
Chris Craik [Wed, 26 Feb 2014 18:44:33 +0000 (10:44 -0800)]
Fix AOSP build - DO NOT MERGE
Change-Id: I42b420c2ce89ce364a2809b28b827964e6923fa1
Sangkyu Lee [Thu, 9 Jan 2014 05:11:57 +0000 (14:11 +0900)]
Fix graphics corruption caused by HWUI caches
Some caches(PatchCache, TextureCache, PathCache) for HWUI
uses deferred removal for their cache entries even though
actual resource objects are immediately freed by
ResourceCache.
For this reason, the uniqueness of a resource address in
the caches is not guaranteed in specific cases.
(Because malloc() can return the same address when malloc()
and free() called very frequently.)
So it can be possible the cache have two cache entries for
two different resources but the same memory address.
(Of course one of the resources is already freed.)
It also can be possible mGarbage vector in PatchCache has
duplicated addresses and this can lead to duplicated free
blocks in the free block list and graphics corruption.
(Deferred removal was implmeneted based on an assumption of
unique resource addresses.)
So this patch makes sure resource objects are freed after
the resources are removed from the caches to guarantee
the uniqueness of a resource address and prevent graphics
corruption.
Change-Id: I040f033a4fc783d2c4bc04b113589657c36fb15b
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
Jeff Davidson [Wed, 26 Feb 2014 18:19:04 +0000 (10:19 -0800)]
Fix SDK build broken by ag/423985
Change-Id: I85480683531468b7a8a83749d9366f5cc334bd24
RoboErik [Wed, 26 Feb 2014 18:13:34 +0000 (18:13 +0000)]
Merge "Move Session apis to android.media.session"
Jeff Davidson [Wed, 26 Feb 2014 17:38:46 +0000 (17:38 +0000)]
Merge "Add --replace-version flag to aapt."
Baligh Uddin [Wed, 26 Feb 2014 17:37:40 +0000 (09:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1b0c2f8d1be740a6cec16fe7ee488211015f4aaa
Auto-generated-cl: translation import
Baligh Uddin [Wed, 26 Feb 2014 17:12:17 +0000 (09:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3c777c8e830dd7339e4b5e235756bf10a49a0627
Auto-generated-cl: translation import
George Mount [Wed, 26 Feb 2014 16:37:03 +0000 (16:37 +0000)]
Revert "Change Activity Scene Transitions to be more automatic."
This reverts commit
f10587faadb9080a7bf9991cbe04bac5525da482.
Change-Id: I2785a3d2d6b667cad6d61dcbbc1c624161735fa4
Yohann Roussel [Wed, 26 Feb 2014 16:23:33 +0000 (16:23 +0000)]
Merge "Add support.multidex tests app for an update bug."
Yohann Roussel [Tue, 15 Oct 2013 08:10:47 +0000 (10:10 +0200)]
Add support.multidex tests app for an update bug.
The failing scenario is
- install v1
- run
- update to v2
- update to v3
- run
last run was failing with initial multidex library versions because
it's still running on v1 extracted secondary dex files.
Change-Id: Id9811371fc70b0a4e9b49de913ee38d18699b21d
Alan Viverette [Wed, 26 Feb 2014 03:04:35 +0000 (03:04 +0000)]
Merge "Constrain starting sub row to list bounds"
Christopher Tate [Wed, 26 Feb 2014 02:48:09 +0000 (02:48 +0000)]
Merge "Deal with apps known to LocalTransport backend but with no data"
Wonsik Kim [Tue, 18 Feb 2014 12:57:14 +0000 (21:57 +0900)]
VideoPlaneView initial implementation
Note that eventually VideoPlaneView should not inherit from SurfaceView.
Remove a few trailing spaces too.
Change-Id: Ia0a461169d560435a827861be2cc15f1e3ee68fa
Alan Viverette [Wed, 26 Feb 2014 02:45:03 +0000 (18:45 -0800)]
Constrain starting sub row to list bounds
BUG:
13077653
Change-Id: Id01da055e8502b1447519666eb439d8480437c6c
Christopher Tate [Wed, 26 Feb 2014 01:42:21 +0000 (17:42 -0800)]
Deal with apps known to LocalTransport backend but with no data
An app might have backed something up and later deleted it, in which
case it will have a directory in the LocalTransport bookkeeping but
with no actual dataset. Skip these packages at restore time, since
we know a priori that there will be nothing to do.
Change-Id: I85853097bc65ed60e5efd217ee6553b50459e445
Amith Yamasani [Wed, 26 Feb 2014 00:54:10 +0000 (16:54 -0800)]
Regen current.txt to fix incorrect id for requiredForProfile
Change-Id: I9b3cf326070bffd78e3e30519495b062c81b3d52
RoboErik [Fri, 21 Feb 2014 18:30:38 +0000 (10:30 -0800)]
Move Session apis to android.media.session
This is to make it easier to distinguish the new apis from the old
ones.
Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
Deepanshu Gupta [Tue, 25 Feb 2014 23:55:58 +0000 (23:55 +0000)]
Merge "Add DatePickerDialog to layoutlib"
George Mount [Tue, 25 Feb 2014 23:47:56 +0000 (23:47 +0000)]
Merge "Change Activity Scene Transitions to be more automatic."
Jim Miller [Tue, 25 Feb 2014 23:39:40 +0000 (23:39 +0000)]
Merge "Disable simple keyguard when notifications enabled."
Jim Miller [Tue, 25 Feb 2014 23:36:13 +0000 (15:36 -0800)]
Disable simple keyguard when notifications enabled.
Enabling notifications on keyguard tripped keyguard into simple
mode which isn't ready for prime-time. Disabled with variable.
Fixes bug
13172958
Change-Id: Ia281b06d754cd62455010f9e31c0ee81e4937977
Deepanshu Gupta [Tue, 25 Feb 2014 23:27:29 +0000 (15:27 -0800)]
Add DatePickerDialog to layoutlib
Includes android.app.DatePickerDialog in the layoutlib.jar
Bug: http://b.android.com/28318
Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
ztenghui [Tue, 25 Feb 2014 23:20:06 +0000 (23:20 +0000)]
Merge "Use pre-computed index to draw the shadow."
ztenghui [Fri, 14 Feb 2014 21:13:41 +0000 (13:13 -0800)]
Use pre-computed index to draw the shadow.
Also draw the umbra part as triangle fans instead of zig zag fashion.
b/
12840179
Change-Id: Iaa5d15e77351acdd71f076bd8f9bb2d4d2b92faf
Jeff Davidson [Tue, 25 Feb 2014 20:28:08 +0000 (12:28 -0800)]
Add --replace-version flag to aapt.
Motivation: we'd like to programmatically specify the version
name/code (i.e. to include the build number from the build server).
However, this means that we cannot specify version info in the
AndroidManifest.xml file, as this takes precedence. Not doing so makes
IDE use more difficult, as the IDE gets version code 0 and won't
install over an existing non-IDE version unless you first force a
downgrade to an IDE build from the command line.
This flag allows us to specify a very high version code in the
AndroidManifest.xml file, making IDE builds take precedence, while
still allowing us to override this info when performing command-line
(official) builds.
Change-Id: I5d01048698af5c26bdf19066c6cd4eca1115112a
Dianne Hackborn [Tue, 25 Feb 2014 02:12:28 +0000 (18:12 -0800)]
More battery stats.
- Add events for sync.
- Add more descriptive tags for wake events.
- Fix battery reset.
- Fix tracking of wifi data.
Change-Id: Ic07f2a86a5ed33e7da57eb1108c31c777ecd801f
Craig Mautner [Tue, 25 Feb 2014 20:29:33 +0000 (20:29 +0000)]
am
97686e00: am
91df7766: am
42ec5035: Modify API to hide ActivityView.
* commit '
97686e00233f6475bd4a5a48bc718fcf88bbf688':
Modify API to hide ActivityView.
Craig Mautner [Tue, 25 Feb 2014 20:25:55 +0000 (20:25 +0000)]
am
91df7766: am
42ec5035: Modify API to hide ActivityView.
* commit '
91df776654e5cf66e5115e0c46ecdbe19a55a0bc':
Modify API to hide ActivityView.
Craig Mautner [Tue, 25 Feb 2014 20:22:28 +0000 (20:22 +0000)]
am
42ec5035: Modify API to hide ActivityView.
* commit '
42ec5035672fbfe701ddbf90dcc4390dab9188af':
Modify API to hide ActivityView.
Craig Mautner [Tue, 25 Feb 2014 20:17:15 +0000 (12:17 -0800)]
Modify API to hide ActivityView.
Fixes build too.
Change-Id: Ibd571cf36c89691a37c45db59c31237fee17adac
John Spurlock [Tue, 25 Feb 2014 19:57:33 +0000 (19:57 +0000)]
Merge "Tabs -> spaces in frameworks/base."
Martijn Coenen [Tue, 25 Feb 2014 19:37:17 +0000 (11:37 -0800)]
Fix NFC docs breakage.
Change-Id: I680dc7974316c77cb1835b5a81f30e6961ba3c49
George Mount [Thu, 6 Feb 2014 22:12:53 +0000 (14:12 -0800)]
Change Activity Scene Transitions to be more automatic.
Shared element transitions are enabled by default
when the Window has a TransitionManager.
Shared element location and size are captured and
transferred to the target Activity.
ActionBar is treated as a shared element.
Change-Id: I0f22ea4e5cbe80254e848444e3f235cb742684f4
Mike Lockwood [Tue, 25 Feb 2014 19:01:24 +0000 (19:01 +0000)]
Merge "Fix accessorychat test program"
Mike Lockwood [Wed, 29 Jan 2014 18:41:05 +0000 (10:41 -0800)]
Fix accessorychat test program
Change-Id: Ib51b880f64b13e860721d594c900b45d5725b718
Dan Sandler [Tue, 25 Feb 2014 18:59:30 +0000 (18:59 +0000)]
Merge "Fix boot crash on devices defaulting to landscape."
Craig Mautner [Tue, 25 Feb 2014 18:56:11 +0000 (18:56 +0000)]
am
c407ace3: am
d4c819c0: am
dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev
* commit '
c407ace3019c4e542654cf17fd04d9436d3f3436':
Clean up activities and displays when done
Craig Mautner [Tue, 25 Feb 2014 18:52:55 +0000 (18:52 +0000)]
am
d4c819c0: am
dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev
* commit '
d4c819c0029da8fb7248564aefde2146d5ecfc19':
Clean up activities and displays when done