OSDN Git Service
kmccormick [Wed, 1 Oct 2014 22:36:57 +0000 (22:36 +0000)]
am
04e50c47: am
d1ba4c13: am
ae3bd63b: am
a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '
04e50c474ce5b6aa2e366bc057a29a16467a66bd':
Doc update: Update preprod (staging) instructions.
Ihab Awad [Wed, 1 Oct 2014 22:36:52 +0000 (22:36 +0000)]
am
24199873: Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev
* commit '
24199873ca3297555909914f92e3cab97169b057':
Refine implementation of GSM conferences (1/3)
Craig Mautner [Wed, 1 Oct 2014 22:36:47 +0000 (22:36 +0000)]
am
245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev
* commit '
245645ca460150b4030d84c88faa931345a90a50':
Don't clear visible-behind activity if it is top
Selim Cinek [Wed, 1 Oct 2014 22:36:07 +0000 (22:36 +0000)]
am
15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev
* commit '
15b2202bacdfcc249d7f51bcd3361e6694d24267':
Adapting translation length for a string in a dialog
Baligh Uddin [Wed, 1 Oct 2014 22:36:04 +0000 (22:36 +0000)]
am
ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ff99ff98cc1ab526c585992b8d1b48128677b192':
Import translations. DO NOT MERGE
John Spurlock [Wed, 1 Oct 2014 22:35:59 +0000 (22:35 +0000)]
am
c909e1b2: Zen: Fix new event category check.
* commit '
c909e1b2dfa2e47b786d96818f70f6308c5a78be':
Zen: Fix new event category check.
Narayan Kamath [Wed, 1 Oct 2014 22:35:50 +0000 (22:35 +0000)]
am
7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev
* commit '
7dc7f676d699c739128dcc7855cbc0dacddaaa57':
Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
Baligh Uddin [Wed, 1 Oct 2014 22:35:15 +0000 (22:35 +0000)]
am
42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
42d0c353ffbd4aa506025a60806348dd07d4082f':
Import translations. DO NOT MERGE
Brian Carlstrom [Wed, 1 Oct 2014 22:35:11 +0000 (22:35 +0000)]
am
7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev
* commit '
7123bd690fa14d0b9e33f5a70c58ea5b5f1b7d32':
Use VMRuntime.isBootClassPathOnDisk
Ricardo Cervera [Wed, 1 Oct 2014 22:34:53 +0000 (22:34 +0000)]
am
1ed09f9b: am
e906b38b: am
781c988a: am
ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '
1ed09f9b5bd7073f1a574499461dfbd47669da09':
docs: ADT beginner text fix
Jeff Brown [Wed, 1 Oct 2014 22:34:44 +0000 (22:34 +0000)]
am
62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev
* commit '
62434d6a4b4b5aa7d44aa4344b5cb0f82df2b923':
Reduce latency from doze to screen on.
Sungsoo Lim [Wed, 1 Oct 2014 22:34:34 +0000 (22:34 +0000)]
am
ee33c661: Merge "Update java doc for content rating systems" into lmp-dev
* commit '
ee33c661ef7055213a8e3d6d02240aab77a82756':
Update java doc for content rating systems
Jerome Poichet [Wed, 1 Oct 2014 22:34:24 +0000 (22:34 +0000)]
am
72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev
* commit '
72079f7f9b644e57169e26597ec7c727786071a1':
Make sure cancel is called on tear down.
Wink Saville [Wed, 1 Oct 2014 22:29:55 +0000 (15:29 -0700)]
Merge commit '
62321ab1' into fix-merge-conflict-lmp-dev-plus-aosp
* commit '
62321ab1':
Maybe fix issue #
17700474: manta: high occurrence of device booted...
Conflicts:
services/core/java/com/android/server/am/ActivityManagerService.java
Change-Id: I7d472115d83a3dde326f991c245b2c6fed29e00c
Dan Albert [Wed, 1 Oct 2014 20:47:12 +0000 (13:47 -0700)]
resolved conflicts for merge of
fe50cfd5 to lmp-dev-plus-aosp
Change-Id: Iea93ad20b44f0183f1868f078dd7982b2798fcd3
Dan Albert [Wed, 1 Oct 2014 20:34:15 +0000 (20:34 +0000)]
am
c46dbe8a: Merge "Use std::sort instead of qsort_r wrapper."
* commit '
c46dbe8ac4748a0084b026524ad9e5ac44fb9fde':
Use std::sort instead of qsort_r wrapper.
Dan Albert [Wed, 1 Oct 2014 20:30:51 +0000 (20:30 +0000)]
Merge "Use std::sort instead of qsort_r wrapper."
Dan Albert [Wed, 1 Oct 2014 18:34:17 +0000 (11:34 -0700)]
Use std::sort instead of qsort_r wrapper.
The HAVE_(BSD|GNU)_QSORT_R in AndroidConfig.h has never worked, and we
should just be using something standard anyway.
Change-Id: I784d6212f6c890a11c4af2f83d1ce2d279708652
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.
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
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
Ricardo Cervera [Wed, 1 Oct 2014 03:08:30 +0000 (03:08 +0000)]
am
781c988a: am
ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '
781c988a767eabf9b1b03b4a74f21e3b687902b6':
docs: ADT beginner text fix
Ricardo Cervera [Wed, 1 Oct 2014 02:57:29 +0000 (02:57 +0000)]
am
ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '
ae7b5dc49381e76c82cda928cc37a6a8b529da25':
docs: ADT beginner text fix
Jeff Brown [Wed, 1 Oct 2014 02:31:30 +0000 (02:31 +0000)]
Merge "Reduce latency from doze to screen on." into lmp-dev
Ricardo Cervera [Wed, 1 Oct 2014 02:07:14 +0000 (02:07 +0000)]
Merge "docs: ADT beginner text fix" into klp-modular-docs
Sungsoo Lim [Wed, 1 Oct 2014 01:46:25 +0000 (01:46 +0000)]
Merge "Update java doc for content rating systems" into lmp-dev
Jerome Poichet [Wed, 1 Oct 2014 01:22:41 +0000 (01:22 +0000)]
Merge "Make sure cancel is called on tear down." into lmp-dev
Dianne Hackborn [Wed, 1 Oct 2014 01:16:14 +0000 (01:16 +0000)]
Merge "Maybe fix issue #
17700474: manta: high occurrence of device booted..." into lmp-dev
Dianne Hackborn [Tue, 30 Sep 2014 21:31:42 +0000 (14:31 -0700)]
Maybe fix issue #
17700474: manta: high occurrence of device booted...
...but dev.bootcomplete flag is not set
Rework things to address a few issues I found:
- When the activity goes idle, the way we were handling finishing the
boot there was calling finishBooting() with the lock held, but it
shouldn't. We now dispatch that and turning on the screen together
in a separate message.
- Make sure we don't try to start the home activity until we have
reached the point of the system being ready and mBooting being set.
This ensures we don't do any work prematurely.
Change-Id: If30c1f287af73bc2164e7aadbe98022ae42cc5e7
Jeff Brown [Tue, 30 Sep 2014 21:42:27 +0000 (14:42 -0700)]
Reduce latency from doze to screen on.
Don't wait for the brightness ramp to complete before reporting
display ready. Keep track of whether we have any unfinished
brightness changes and take care to grab a wakelock to ensure
they are eventually applied.
Ideally we would rewrite the whole state machine to more carefully
coordinate screen state and brightness changes but that's too
risky for now.
The pixel fairies are having a bad day.
Bug:
17718416
(cherry picked from commit
875f80c2732a3fbe652a6e8fc14031041f791308)
Change-Id: I7a2d8ba4591a12b773653d3dbf86c7db016f967e
Jerome Poichet [Wed, 1 Oct 2014 00:54:03 +0000 (17:54 -0700)]
Make sure cancel is called on tear down.
- Make sure cancel is called when consumer of SpeechRecognizer calls
destroy.
- If consumer goes away, make sure to call cancel as well.
b/
17584947 Pressing mic button in Music hoses audio
Change-Id: Ibe1198b37fe6167493a8694f9089d970f1eb07de
Amit Mahajan [Wed, 1 Oct 2014 00:48:50 +0000 (00:48 +0000)]
am
496aeb1a: Merge "Roaming blacklist" into lmp-dev
* commit '
496aeb1a6156f3c089135a7ce4fab550589eaff7':
Roaming blacklist
Adam Lesinski [Wed, 1 Oct 2014 00:44:31 +0000 (00:44 +0000)]
am
cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
* commit '
cd8e73817d14798f9d2031ffd301a03a096b7907':
Fix issue with using locally defined attrs in a shared lib
Amit Mahajan [Wed, 1 Oct 2014 00:44:01 +0000 (00:44 +0000)]
Merge "Roaming blacklist" into lmp-dev
Sungsoo Lim [Fri, 19 Sep 2014 04:49:25 +0000 (13:49 +0900)]
Update java doc for content rating systems
- DVB and ISDB ratings are added.
- Remove rating systems whose countries uses DVB and ISDB.
- Updated java doc for AR, AU, and BR.
Bug:
17494772
Change-Id: Ia2a63c7914148b42078decb8de1ae45baefb010d
Adam Lesinski [Wed, 1 Oct 2014 00:39:56 +0000 (00:39 +0000)]
Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
w19976 [Tue, 30 Sep 2014 00:44:11 +0000 (17:44 -0700)]
Roaming blacklist
Bug:
17684236
Change-Id: I3e4a293ed8ae134d77fe3ce0c0cfa3b6012500a8
Alan Viverette [Wed, 1 Oct 2014 00:36:45 +0000 (00:36 +0000)]
am
c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev
* commit '
c2379e005d3e692d0b725c65fa842459e65ad1dc':
Add activated text colors, update Material preference header
Alan Viverette [Wed, 1 Oct 2014 00:36:41 +0000 (00:36 +0000)]
am
191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev
* commit '
191807e3863d873cd315701ab7f32b0b51e1bf35':
Remove baked-in shadow insets from Material dialog minHeight
Alan Viverette [Wed, 1 Oct 2014 00:35:01 +0000 (00:35 +0000)]
Merge "Add activated text colors, update Material preference header" into lmp-dev
Alan Viverette [Wed, 1 Oct 2014 00:32:38 +0000 (00:32 +0000)]
Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev
Vineeta Srivastava [Wed, 1 Oct 2014 00:11:04 +0000 (00:11 +0000)]
am
ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev
* commit '
ab1e241d385ac2cb589f961cf6ea4a86b8a3e867':
Show one name if both plmn and spn are equal
Alan Viverette [Wed, 1 Oct 2014 00:07:25 +0000 (17:07 -0700)]
Remove baked-in shadow insets from Material dialog minHeight
We don't bake in shadows anymore, so this was making the minimum
content area way too tall.
BUG:
17700338
Change-Id: I728693654a6dc1c8d75a258746409b61639dccfc
Vineeta Srivastava [Wed, 1 Oct 2014 00:03:32 +0000 (00:03 +0000)]
Merge "Show one name if both plmn and spn are equal" into lmp-dev
Vineeta Srivastava [Wed, 1 Oct 2014 00:02:58 +0000 (00:02 +0000)]
am
575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev
* commit '
575bf7e6ccd3555e2f7e7b90f061867fa1a39934':
Correct MTU size for Bell
Vineeta Srivastava [Wed, 1 Oct 2014 00:00:01 +0000 (00:00 +0000)]
Merge "Correct MTU size for Bell" into lmp-dev
Ian Rogers [Tue, 30 Sep 2014 23:52:22 +0000 (23:52 +0000)]
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp
Eino-Ville Talvala [Tue, 30 Sep 2014 23:51:26 +0000 (23:51 +0000)]
am
0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev
* commit '
0a62ab707977d4d6666d1c452ba702442655b6e6':
Camera2 Legacy: Set a default thumbnail size
Elliott Hughes [Tue, 30 Sep 2014 23:51:04 +0000 (23:51 +0000)]
am
ee7684ca: am
04517286: Merge "Use strerror(3) when reporting zygote failures."
* commit '
ee7684cad00a13fc82519599ad8fab3cfbd6fe8b':
Use strerror(3) when reporting zygote failures.
Brian Carlstrom [Mon, 29 Sep 2014 20:44:04 +0000 (13:44 -0700)]
Use VMRuntime.isBootClassPathOnDisk
Bug:
17679443
Change-Id: If53c236058a7237d735c2344a715cf0a36301f9b
Ihab Awad [Tue, 30 Sep 2014 16:17:03 +0000 (09:17 -0700)]
Refine implementation of GSM conferences (1/3)
Bug:
17684223
Change-Id: I05d05b594803ea2c1da4247111b70ad5f870ac46
Eino-Ville Talvala [Tue, 30 Sep 2014 23:44:58 +0000 (23:44 +0000)]
Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev
Andreas Gampe [Tue, 30 Sep 2014 23:41:19 +0000 (16:41 -0700)]
resolved conflicts for merge of
6290c048 to lmp-dev-plus-aosp
Change-Id: I9fd4b4402f301c3521f57b207793ab4dfdd67a12
Svetoslav [Tue, 30 Sep 2014 23:38:21 +0000 (23:38 +0000)]
am
6b491b64: Merge "Invalid accessibility state if UI test process crashes in a bad time." into lmp-dev
* commit '
6b491b64ba7200a85199452b6a7f99c777105f22':
Invalid accessibility state if UI test process crashes in a bad time.
Sungmin Choi [Mon, 29 Sep 2014 06:21:15 +0000 (15:21 +0900)]
Show one name if both plmn and spn are equal
If both plmn and SPN are SKTelecom, lockscreen is shown as SKTelecom-SKTelecom.
In this case, it would be better to show only SKTelecom.
Bug:
17702041
Change-Id: I268455b037752cf21a3247be7809283f50b72c27
Svetoslav [Tue, 30 Sep 2014 23:33:55 +0000 (23:33 +0000)]
Merge "Invalid accessibility state if UI test process crashes in a bad time." into lmp-dev
Winson Chung [Tue, 30 Sep 2014 23:30:11 +0000 (23:30 +0000)]
Gordon Gao [Tue, 23 Sep 2014 22:13:14 +0000 (15:13 -0700)]
Correct MTU size for Bell
Bug:
17627179
Change-Id: I4740326b0211ca34b82267ebe953f2930f4e3690
Adam Lesinski [Tue, 30 Sep 2014 23:06:58 +0000 (16:06 -0700)]
Fix issue with using locally defined attrs in a shared lib
The attribute name resource IDs were never fixed up with
the runtime package ID so we weren't finding attributes
whenever the runtime package ID was different than the build
time one, which happened to be when a shared lib referenced itself
(0x00 vs 0x02).
Bug:
17666947
Change-Id: Icf3e874bcea0e27eebe42d60fbed626a34bf9266
Winson Chung [Tue, 30 Sep 2014 23:17:12 +0000 (16:17 -0700)]
Fixing build (Bug
17381033)
Change-Id: I95a7c8167f82a4fe982bdc9588d5fbaf5a627d0b
Svetoslav [Tue, 30 Sep 2014 23:03:20 +0000 (16:03 -0700)]
Invalid accessibility state if UI test process crashes in a bad time.
We allow a fake accessibility service to connect to the system for UI
automation. If the process hosting the fake service dies right after
registering it, the accessibility layer ends up in a bad state and
subsequent attempts to connect UI automation service fail.
bug:
17725904
Change-Id: Idad288eab41bbdd486d95e1e5803220640653fb7
Winson Chung [Tue, 30 Sep 2014 22:51:39 +0000 (22:51 +0000)]
am
c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug
17657878)" into lmp-dev
* commit '
c12f57457411e67adf2c8acaad21b08c934e583b':
Fixing an issue with leaking starting windows. (Bug
17657878)
Craig Mautner [Tue, 30 Sep 2014 22:51:35 +0000 (22:51 +0000)]
am
4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev
* commit '
4fb4163f4c6f49eebc34d1b193c526558af0d375':
Call Surface.release() for starting windows
Winson Chung [Tue, 30 Sep 2014 22:48:42 +0000 (22:48 +0000)]
Merge "Fixing an issue with leaking starting windows. (Bug
17657878)" into lmp-dev
Craig Mautner [Tue, 30 Sep 2014 22:47:03 +0000 (22:47 +0000)]
Merge "Call Surface.release() for starting windows" into lmp-dev
Adam Powell [Tue, 30 Sep 2014 22:22:01 +0000 (22:22 +0000)]
am
fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev
* commit '
fe426d061ad5feb65200c2970bf826b10e356247':
Inset the non-overlay contextual action bar without a status guard
Winson Chung [Tue, 30 Sep 2014 22:04:02 +0000 (15:04 -0700)]
Fixing an issue with leaking starting windows. (Bug
17657878)
In some cases, when starting an animation while another starting window is visible,
the starting window is never scheduled to be removed. In that case, we try and
schedule the closing app starting window to be removed when we are starting the
transition to a new activity. This also partially addresses issues related to
leaking windows in b/
17381033.
Change-Id: Id26525cd71380852f109ec2f55a4a60db5086ded
Adam Powell [Tue, 30 Sep 2014 22:17:00 +0000 (22:17 +0000)]
Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev
Alan Viverette [Tue, 30 Sep 2014 22:09:26 +0000 (22:09 +0000)]
am
c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev
* commit '
c44c77d305c02d9c8280df5ce3a816ee586c9d52':
Implement missing visibility management for FrameLayout foreground
ztenghui [Tue, 30 Sep 2014 22:09:22 +0000 (22:09 +0000)]
am
ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-dev
* commit '
ffa16f944882f2e27109af8fe4b7272322f9cb84':
Correct the documentation for VectorDrawable
Ruben Brunk [Tue, 30 Sep 2014 22:09:18 +0000 (22:09 +0000)]
am
b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
* commit '
b3c802f2381c3411fe753206ab89027f60164b77':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
Ricardo Cervera [Tue, 30 Sep 2014 22:07:16 +0000 (15:07 -0700)]
docs: ADT beginner text fix
Change-Id: I03cc08d5a4f12137a573c23d1ee07e048225c8f5
Alan Viverette [Tue, 30 Sep 2014 22:06:02 +0000 (22:06 +0000)]
Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev
ztenghui [Tue, 30 Sep 2014 22:05:59 +0000 (22:05 +0000)]
Merge "Correct the documentation for VectorDrawable" into lmp-dev
Ruben Brunk [Tue, 30 Sep 2014 22:05:47 +0000 (22:05 +0000)]
Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
Craig Mautner [Thu, 25 Sep 2014 21:49:26 +0000 (14:49 -0700)]
Call Surface.release() for starting windows
If the window maanger received BinderDied for a starting window
before activity manager then it would null
AppWindowToken.startingWindow and not go through the
PhoneWindowManager.removeStartingWindow call later. That meant that
Surface.release() was never called from
ViewRootImpl.dispatchDetachedFromWindow(). Which in turn meant that
graphics memory was being leaked.
This change notifies the PhoneWindowManager to go through the
removeStartingWindow path when the starting window gets removed for
any reason.
This change also ensures that scheduleRemoveStartingWindow is
always called with the window manager lock held.
Fixes bug
17381033.
Change-Id: Ic6860d0e1410c9bb5053d85ae21a08b11f573b6d
ztenghui [Mon, 29 Sep 2014 20:19:00 +0000 (13:19 -0700)]
Correct the documentation for VectorDrawable
We missed the alpha for the vector drawable root level in the documentation.
And the animation target can be vector drawable itself for the alpha value,
which is more than path and group object.
b/
17696183
Change-Id: Ic9d441fbdf411dad92718ae5adbc6655fe708453
Alan Viverette [Tue, 30 Sep 2014 21:43:32 +0000 (14:43 -0700)]
Add activated text colors, update Material preference header
Addresses contrast issues when using activated background.
BUG:
17521147
Change-Id: Ia242c6d7bd0c1b5ca545a81fe515f15320b14d67
Alan Viverette [Tue, 30 Sep 2014 21:27:58 +0000 (14:27 -0700)]
Implement missing visibility management for FrameLayout foreground
BUG:
15350931
Change-Id: I16900d0d95051489852385d682e7b5aa4adad327
Jeff Sharkey [Tue, 30 Sep 2014 21:14:56 +0000 (21:14 +0000)]
am
b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev
* commit '
b27d43a8805769f9a9dfdc024b5cd19b71cfd8d7':
Clear ident when obtaining provider across users.
Jeff Sharkey [Tue, 30 Sep 2014 21:10:47 +0000 (21:10 +0000)]
Merge "Clear ident when obtaining provider across users." into lmp-dev
Jeff Sharkey [Tue, 30 Sep 2014 20:55:39 +0000 (13:55 -0700)]
Clear ident when obtaining provider across users.
When calling getContentProvider() across user boundaries, and
creating the provider for the first time, we need to clear caller
identity. (We could have torn down the provider while the system
was under memory pressure.)
Bug:
17409650
Change-Id: I67713a03e5f7106f5e8fcf33fe3fdae81ce644ec
Ruben Brunk [Tue, 30 Sep 2014 10:42:13 +0000 (03:42 -0700)]
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
Bug:
17675571
- All of the mistakes were made. Unmake them.
Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
Adam Powell [Tue, 30 Sep 2014 20:21:12 +0000 (13:21 -0700)]
Inset the non-overlay contextual action bar without a status guard
When the status guard is not available, (e.g. when the window is not
drawing system bars) do not consume the insets when an action mode is
active.
Bug
17691453
Change-Id: I459622eaf161a96152fb9ac5f60bb9508aa4de89
Dianne Hackborn [Tue, 30 Sep 2014 20:23:01 +0000 (20:23 +0000)]
am
9cf01b63: Merge "More work on issue #
17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '
9cf01b63cb0023aec0e05b1ce050ff572532b876':
More work on issue #
17656716: Unhandled exception in Window Manager
Dianne Hackborn [Tue, 30 Sep 2014 20:18:47 +0000 (20:18 +0000)]
Merge "More work on issue #
17656716: Unhandled exception in Window Manager" into lmp-dev
Svetoslav [Tue, 30 Sep 2014 20:07:46 +0000 (20:07 +0000)]
am
44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
* commit '
44d4eeaa48721296663a05d01071f196a509dc34':
Use default encryption password if an accessibility service is enabled.
Svetoslav [Tue, 30 Sep 2014 20:01:03 +0000 (20:01 +0000)]
Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev