OSDN Git Service
Craig Mautner [Thu, 24 Apr 2014 17:50:32 +0000 (17:50 +0000)]
am
5e6e27ed: Merge "Take screenshots of pausing activity"
* commit '
5e6e27edb7d59255d07e2f74dac74e5898cf949b':
Take screenshots of pausing activity
Craig Mautner [Thu, 24 Apr 2014 17:44:42 +0000 (17:44 +0000)]
Merge "Take screenshots of pausing activity"
Craig Mautner [Thu, 24 Apr 2014 17:19:20 +0000 (10:19 -0700)]
Take screenshots of pausing activity
Previous CL to optimize out excessive screenshots (ag/379669) was too
effective and didn't take screenshots when going into an activity
that had attribute Window_windowNoDisplay. Adding in the test for
ActivityRecord.noDisplay allows screenshots for this situation.
Fixes bug
13410507.
Change-Id: Ieafebf44b7d1a3ba18115e762fba113f8d1c0252
Craig Mautner [Thu, 24 Apr 2014 17:34:10 +0000 (17:34 +0000)]
am
d2cc56eb: resolved conflicts for merge of
f8a58208 to master
* commit '
d2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6':
Add activity attribute allowEmbedded
Craig Mautner [Thu, 24 Apr 2014 17:27:04 +0000 (10:27 -0700)]
resolved conflicts for merge of
f8a58208 to master
Conflicts:
core/java/android/content/pm/PackageParser.java
core/res/res/values/attrs_manifest.xml
core/res/res/values/public.xml
Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2
Alexandra Gherghina [Thu, 24 Apr 2014 17:16:22 +0000 (17:16 +0000)]
am
80021878: Merge "Fix two potential NPEs in DeviceInfo"
* commit '
80021878a840abffafd9c53e70d39ae2eef90841':
Fix two potential NPEs in DeviceInfo
Alexandra Gherghina [Thu, 24 Apr 2014 17:11:51 +0000 (17:11 +0000)]
Merge "Fix two potential NPEs in DeviceInfo"
Alexandra Gherghina [Thu, 24 Apr 2014 16:55:30 +0000 (17:55 +0100)]
Fix two potential NPEs in DeviceInfo
Change-Id: Ic4b5b203af25cda9ae65b477c92c1fb5f31ab093
Craig Mautner [Thu, 24 Apr 2014 16:33:02 +0000 (16:33 +0000)]
am
03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev
* commit '
03981a4c2e9689197e4d2c916c07ae16207b5276':
Add activity attribute allowEmbedded
Raph Levien [Thu, 24 Apr 2014 16:30:14 +0000 (16:30 +0000)]
am
79cb5505: am
07bed492: am
e4ee0e31: Merge "Fix bug
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
79cb5505a97a0465fb849dc20dcaf3dd2f608c9f':
Fix bug
14276128 Clipping at bottom of TextView
Craig Mautner [Thu, 24 Apr 2014 16:30:14 +0000 (16:30 +0000)]
Merge "Add activity attribute allowEmbedded" into klp-modular-dev
Raph Levien [Thu, 24 Apr 2014 16:25:21 +0000 (16:25 +0000)]
am
07bed492: am
e4ee0e31: Merge "Fix bug
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
07bed4921a05e717a4b7f10a25e3830e346426b7':
Fix bug
14276128 Clipping at bottom of TextView
Michael Kolb [Thu, 24 Apr 2014 16:22:05 +0000 (16:22 +0000)]
am
83474f5b: am
0fc5f869: am
e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev
* commit '
83474f5b4d870c12d39cef5ae28b7e3fb6d6a765':
Use rotation to position circular display mask
Raph Levien [Thu, 24 Apr 2014 16:18:08 +0000 (16:18 +0000)]
am
e4ee0e31: Merge "Fix bug
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
e4ee0e3193f8e66cabc5352046969041ad4921e5':
Fix bug
14276128 Clipping at bottom of TextView
Michael Kolb [Thu, 24 Apr 2014 16:16:59 +0000 (16:16 +0000)]
am
0fc5f869: am
e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev
* commit '
0fc5f86950f6089eb8b4cbc0bf9684b8be090fa3':
Use rotation to position circular display mask
Michael Kolb [Thu, 24 Apr 2014 16:13:41 +0000 (16:13 +0000)]
am
e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev
* commit '
e597d5f9310f760843272c728d6fb1917abf241a':
Use rotation to position circular display mask
Raph Levien [Thu, 24 Apr 2014 16:12:54 +0000 (16:12 +0000)]
Merge "Fix bug
14276128 Clipping at bottom of TextView" into klp-modular-dev
Michael Kolb [Thu, 24 Apr 2014 16:08:21 +0000 (16:08 +0000)]
Merge "Use rotation to position circular display mask" into klp-modular-dev
Michael Kolb [Thu, 24 Apr 2014 05:06:21 +0000 (22:06 -0700)]
Use rotation to position circular display mask
Bug:
14231785
Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc
Kenny Guy [Thu, 24 Apr 2014 15:53:14 +0000 (15:53 +0000)]
am
1c299031: Merge "Fix bug with getLauncherActivities ignoring packageName."
* commit '
1c299031982b6145e372aa43a3b8a5c683fad3da':
Fix bug with getLauncherActivities ignoring packageName.
Baligh Uddin [Thu, 24 Apr 2014 15:53:10 +0000 (15:53 +0000)]
am
7cb08dd9: (-s ours) am
d0af9589: (-s ours) am
aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
7cb08dd95eec0d940495d1c29dafce387c7c9d0e':
Import translations. DO NOT MERGE
Craig Mautner [Thu, 24 Apr 2014 15:53:07 +0000 (15:53 +0000)]
am
6c66d1fd: am
7e28afd9: am
7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev
* commit '
6c66d1fd79968ad286d3cb6477e762d7e8bdc5ec':
Force ActivityView activities to start in new task
Elliott Hughes [Thu, 24 Apr 2014 15:53:04 +0000 (15:53 +0000)]
am
f4567f0c: am
56cc5ba7: am
8d47f23e: am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
f4567f0c50e88261dd897a9933b5d885c1406a45':
Fix a typo in an assertion.
Kenny Guy [Thu, 24 Apr 2014 15:49:08 +0000 (15:49 +0000)]
Merge "Fix bug with getLauncherActivities ignoring packageName."
Baligh Uddin [Thu, 24 Apr 2014 15:43:59 +0000 (15:43 +0000)]
am
d0af9589: (-s ours) am
aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
d0af9589ff8971bb02ee764454e3a46b0c2aebaa':
Import translations. DO NOT MERGE
Craig Mautner [Thu, 24 Apr 2014 15:43:37 +0000 (15:43 +0000)]
am
7e28afd9: am
7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev
* commit '
7e28afd9568c590c7110f83b252dbb77f165fcb3':
Force ActivityView activities to start in new task
Elliott Hughes [Thu, 24 Apr 2014 15:43:24 +0000 (15:43 +0000)]
am
56cc5ba7: am
8d47f23e: am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
56cc5ba79bdf75a73281dc73f13169a409d96c28':
Fix a typo in an assertion.
Craig Mautner [Thu, 24 Apr 2014 04:38:50 +0000 (21:38 -0700)]
Add activity attribute allowEmbedded
Activitys without allowEmbedded=true may not be launched in an ActivityView.
Fixes bug
13693121.
Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
Alexandra Gherghina [Thu, 24 Apr 2014 15:25:58 +0000 (15:25 +0000)]
am
e255d739: Merge "Modify getUserProfiles to return only enabled profiles:"
* commit '
e255d7399f46de4b4e3d94b95b26df3408274394':
Modify getUserProfiles to return only enabled profiles:
Alexandra Gherghina [Thu, 24 Apr 2014 15:22:09 +0000 (15:22 +0000)]
Merge "Modify getUserProfiles to return only enabled profiles:"
John Spurlock [Thu, 24 Apr 2014 14:39:07 +0000 (14:39 +0000)]
am
10459a54: Merge "Move notification listener management into helper."
* commit '
10459a541171357a18ee897ffcfed0150600fb16':
Move notification listener management into helper.
Baligh Uddin [Thu, 24 Apr 2014 14:34:13 +0000 (14:34 +0000)]
am
6ec0b321: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
6ec0b32173e6eeb643285975489ac95a08f6f315':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:34:10 +0000 (14:34 +0000)]
am
0dea3a6e: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
0dea3a6eeac31fff541c284bbf74f123ac163cd2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:34:07 +0000 (14:34 +0000)]
am
b2cb3a25: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
b2cb3a25186687abeed573c5105deb5b1b724110':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:34:04 +0000 (14:34 +0000)]
am
781d1ca2: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
781d1ca2c500b589beb9eaef0221b41b4c6b840b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:34:02 +0000 (14:34 +0000)]
am
aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
aed314e8f3e53627518222777c2fe89666bfd643':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Apr 2014 14:34:01 +0000 (14:34 +0000)]
am
9ea71200: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
9ea712006dce43fbc7c9091b344aba8c11a884f8':
Import translations. DO NOT MERGE
John Spurlock [Thu, 24 Apr 2014 14:32:40 +0000 (14:32 +0000)]
Merge "Move notification listener management into helper."
Baligh Uddin [Thu, 24 Apr 2014 14:28:38 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 24 Apr 2014 14:28:31 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 24 Apr 2014 14:28:29 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 24 Apr 2014 14:28:19 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 24 Apr 2014 14:28:13 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 24 Apr 2014 14:28:11 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE"
George Mount [Thu, 24 Apr 2014 14:15:53 +0000 (14:15 +0000)]
am
19d13817: Merge "Properly filter out excluded views in createAnimators() call."
* commit '
19d138175281c56c16df0d395db17593356547ac':
Properly filter out excluded views in createAnimators() call.
George Mount [Thu, 24 Apr 2014 14:12:16 +0000 (14:12 +0000)]
Merge "Properly filter out excluded views in createAnimators() call."
Kenny Guy [Wed, 23 Apr 2014 20:00:45 +0000 (21:00 +0100)]
Fix bug with getLauncherActivities ignoring packageName.
Change-Id: Ica5817378a24cb4b68e2c99e37cd214d3fde8ba4
Craig Mautner [Thu, 24 Apr 2014 09:11:30 +0000 (09:11 +0000)]
am
7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev
* commit '
7d2d2272f1dc91f27983797349f8253bfa25e8b4':
Force ActivityView activities to start in new task
Alexandra Gherghina [Thu, 3 Apr 2014 12:37:39 +0000 (13:37 +0100)]
Modify getUserProfiles to return only enabled profiles:
Add a new enabled state for a managed profile.
Expose that as a new API on DevicePolicyManager.
Set the new state when enabling the profile.
Return only enabled profiles from the user manager.
Bug:
13755441
Bug:
13755091
Change-Id: I2907b182e19b3562592da688b3f68ef5f4088557
Elliott Hughes [Thu, 24 Apr 2014 09:01:44 +0000 (09:01 +0000)]
am
8d47f23e: am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
8d47f23e43760dcbf051aaeffff668c3c6340276':
Fix a typo in an assertion.
Craig Mautner [Thu, 24 Apr 2014 04:28:27 +0000 (04:28 +0000)]
Merge "Force ActivityView activities to start in new task" into klp-modular-dev
Deepanshu Gupta [Thu, 24 Apr 2014 03:29:22 +0000 (03:29 +0000)]
am
6dd5a1d3: am
8f9d92c4: (-s ours) am
7406e4b8: am
7947ec71: am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
6dd5a1d348900f4ebf10c96f0af7166219729024':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 03:29:19 +0000 (03:29 +0000)]
am
36ec9c95: am
057dca97: (-s ours) am
1668ae8d: am
a019e772: am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
36ec9c9581fac43801e9a9af6b8a2af942f90d22':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 03:29:16 +0000 (03:29 +0000)]
am
dba62dc9: am
5dee1a09: (-s ours) am
e17ed922: am
126f4057: am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
dba62dc9047c99615aa952a9404109490f28a8d1':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 03:24:18 +0000 (03:24 +0000)]
am
8f9d92c4: (-s ours) am
7406e4b8: am
7947ec71: am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
8f9d92c4ca5233607ca01dac0b3b66fde5539307':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 03:24:14 +0000 (03:24 +0000)]
am
057dca97: (-s ours) am
1668ae8d: am
a019e772: am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
057dca97d9a486b94c82673a95a7a3933bca9a4d':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 03:24:10 +0000 (03:24 +0000)]
am
5dee1a09: (-s ours) am
e17ed922: am
126f4057: am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
5dee1a093abc4d6fd197ba2c3be012c9536ba1c5':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:22 +0000 (01:36 +0000)]
am
7406e4b8: am
7947ec71: am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
7406e4b8102ffd71affd55a9f453c0ecce13a097':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:18 +0000 (01:36 +0000)]
am
1668ae8d: am
a019e772: am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
1668ae8d2a29b491c3ae421c5b0eca101fb10824':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:36:14 +0000 (01:36 +0000)]
am
e17ed922: am
126f4057: am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
e17ed922001cf70c48969eb7b10ee2e2557b41f9':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:24 +0000 (01:31 +0000)]
am
7947ec71: am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
7947ec715d8b4a0c82135553abb4947b61bf802b':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:20 +0000 (01:31 +0000)]
am
a019e772: am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
a019e77252f86962b9803042c01b897f7f1aa89f':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:31:15 +0000 (01:31 +0000)]
am
126f4057: am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
126f4057a06756fbb1c194b5d9d40f9f922d14ee':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:30:23 +0000 (01:30 +0000)]
am
8deae79d: Merge "Bug fix in layoutlib"
* commit '
8deae79d9f6ddd0e610fde54f1cd8b7087507a22':
Bug fix in layoutlib
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:53 +0000 (01:27 +0000)]
am
b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
* commit '
b64732d977c023423cd01d32361a49401d9203cd':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:50 +0000 (01:27 +0000)]
am
6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
* commit '
6aaea1bd4aa056335776098cd9dc523e898716f1':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Thu, 24 Apr 2014 01:27:45 +0000 (01:27 +0000)]
am
5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '
5ba2f230faa355eb9bc1e90f6c48eeeb437f390c':
Add view cookies for action bar menus. [DO NOT MERGE]
Aravind Akella [Thu, 24 Apr 2014 01:25:10 +0000 (01:25 +0000)]
am
3f382330: Merge "Bug fix for wakeup sensors."
* commit '
3f3823308a412b5cd4a9726d51bf017d379e752d':
Bug fix for wakeup sensors.
Deepanshu Gupta [Thu, 24 Apr 2014 01:21:54 +0000 (01:21 +0000)]
Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 24 Apr 2014 01:21:45 +0000 (01:21 +0000)]
Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
John Spurlock [Thu, 24 Apr 2014 01:12:45 +0000 (21:12 -0400)]
Move notification listener management into helper.
Part of a larger effort to reuse service management code. This is
mostly algebraic, simply move code related to listener management
into a new helper, and cut the backreference to NoMan. Put
user-profile code into reusable inner helper, and common uid-checking
code into a new static util helper.
Resist the urge to rewrite / reformat, but replace HashSet with
ArraySet.
Bug:
13743109
Change-Id: I59e0131f632c3bbf555b5276dc5092422113cdc3
Deepanshu Gupta [Thu, 24 Apr 2014 01:10:36 +0000 (01:10 +0000)]
Merge "Bug fix in layoutlib"
Deepanshu Gupta [Thu, 24 Apr 2014 01:07:07 +0000 (18:07 -0700)]
Bug fix in layoutlib
Renaming a method wasn't completed properly.
The bug was introduced in the following change:
Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(
1001961f904bac5294aaf73a47c2497aa764bf7f)
Change-Id: I698437b428d696c656e2268ded654a612a3e0c80
Deepanshu Gupta [Wed, 23 Apr 2014 00:22:32 +0000 (17:22 -0700)]
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit
fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)
Deepanshu Gupta [Fri, 18 Apr 2014 19:32:38 +0000 (12:32 -0700)]
Add view cookies for action bar menus. [DO NOT MERGE]
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.
The change also contains a bugfix where a method wasn't renamed
properly.
Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit
1001961f904bac5294aaf73a47c2497aa764bf7f)
Aravind Akella [Thu, 24 Apr 2014 00:40:59 +0000 (00:40 +0000)]
Merge "Bug fix for wakeup sensors."
Winson Chung [Thu, 24 Apr 2014 00:27:28 +0000 (00:27 +0000)]
am
628f8966: Merge "Fixing crash in SystemServicesProxy getting activity label (Bug.
14260718)"
* commit '
628f89667410f8c1d7e8892292aa36634f3e3384':
Fixing crash in SystemServicesProxy getting activity label (Bug.
14260718)
Chris Craik [Thu, 24 Apr 2014 00:27:25 +0000 (00:27 +0000)]
am
717f39c7: Merge "Clip TouchFeedbackDrawable effect to receiver Outline"
* commit '
717f39c7d98c7e4b08f7bb88102c720cb8990004':
Clip TouchFeedbackDrawable effect to receiver Outline
John Reck [Thu, 24 Apr 2014 00:27:22 +0000 (00:27 +0000)]
am
f4201925: Merge "Add missing try/finallys"
* commit '
f4201925d9e3d01e7a2a1db07c8186e4ba9a0fb5':
Add missing try/finallys
Amith Yamasani [Thu, 24 Apr 2014 00:27:19 +0000 (00:27 +0000)]
am
5451c559: Merge "Don\'t show managed profiles in the user switcher"
* commit '
5451c559ecd3ac45e3d4dfc5838cb1996404116d':
Don't show managed profiles in the user switcher
Elliott Hughes [Thu, 24 Apr 2014 00:25:01 +0000 (00:25 +0000)]
am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
dbb0de21d35343504b096ae6cbf97d122ac410c9':
Fix a typo in an assertion.
Winson Chung [Thu, 24 Apr 2014 00:14:02 +0000 (00:14 +0000)]
Merge "Fixing crash in SystemServicesProxy getting activity label (Bug.
14260718)"
Chris Craik [Thu, 24 Apr 2014 00:08:08 +0000 (00:08 +0000)]
Merge "Clip TouchFeedbackDrawable effect to receiver Outline"
Aravind Akella [Wed, 12 Feb 2014 02:44:42 +0000 (18:44 -0800)]
Bug fix for wakeup sensors.
SensorService should hold a wakelock till the app reads events from a wakeup sensor. Currently drivers hold a wakelock with a
timeout while delivering events from a wake up sensor like Significant Motion. This hack can be removed now.
Bug:
9774884
Change-Id: I6cab0147c63f57a494a61f4dfe2a64a27dfe1b4e
Elliott Hughes [Wed, 23 Apr 2014 23:55:33 +0000 (23:55 +0000)]
Merge "Fix a typo in an assertion."
Elliott Hughes [Wed, 23 Apr 2014 23:54:33 +0000 (16:54 -0700)]
Fix a typo in an assertion.
Change-Id: I3e97bb3cb8070c0ec0c6b97769f1da3e7b4ef8f5
Chris Craik [Wed, 23 Apr 2014 23:53:26 +0000 (23:53 +0000)]
am
3c37bcee: Merge "Fix translationZ matrix computation"
* commit '
3c37bcee9b241d9ee5c420e9e16dca236e8a0304':
Fix translationZ matrix computation
Winson Chung [Wed, 23 Apr 2014 23:53:22 +0000 (23:53 +0000)]
am
1b244f44: Merge "Piping through ability for an Activity to remove its own task. (Bug
13735914)"
* commit '
1b244f44a796484866f13e0639420477c3191695':
Piping through ability for an Activity to remove its own task. (Bug
13735914)
Winson Chung [Wed, 23 Apr 2014 22:19:56 +0000 (15:19 -0700)]
Fixing crash in SystemServicesProxy getting activity label (Bug.
14260718)
- Fixing issue with wrong margins due to moved activity icon
Change-Id: Ib3631dc4cf4244d44737ee95b597bd25653815c8
John Reck [Wed, 23 Apr 2014 23:34:51 +0000 (23:34 +0000)]
Merge "Add missing try/finallys"
Amith Yamasani [Wed, 23 Apr 2014 23:33:04 +0000 (23:33 +0000)]
Merge "Don't show managed profiles in the user switcher"
Raph Levien [Wed, 23 Apr 2014 22:52:55 +0000 (15:52 -0700)]
Fix bug
14276128 Clipping at bottom of TextView
Avoid applying "extra" linespacing to the last line of a layout, because
when that is negative, it causes clipping.
Change-Id: I4cc8792fd3444e4118604cc3d0f816d59dfc1e74
Chris Craik [Tue, 15 Apr 2014 23:18:08 +0000 (16:18 -0700)]
Clip TouchFeedbackDrawable effect to receiver Outline
Projected RenderNodes are now wrapped with a ClipRect or masked
SaveLayer, so that they are clipped to the outline of the projection
receiver surface.
Change-Id: I1d4afc1bb5d638d650bc0b1dac51a498f216773e
Deepanshu Gupta [Tue, 1 Apr 2014 01:59:45 +0000 (18:59 -0700)]
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
The bug caused some classes to be missed when computing the dependencies
of the existing classes.
Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from
4a0f93bd32b8dd9b3c351680ad82e461d5111f38)
Selim Gurun [Wed, 23 Apr 2014 21:50:09 +0000 (21:50 +0000)]
am
25a13518: Merge "Tune down the linkify false positive rate"
* commit '
25a1351831b9912c8316a90444fb3bd1521b5cfc':
Tune down the linkify false positive rate
John Reck [Wed, 23 Apr 2014 21:48:28 +0000 (14:48 -0700)]
Add missing try/finallys
Change-Id: I32be65f5a46768449f26b69f72f502acd1e72769
Amith Yamasani [Wed, 23 Apr 2014 21:43:23 +0000 (14:43 -0700)]
Don't show managed profiles in the user switcher
Only show users that you can switch to.
Change-Id: Iff6dfccc27230f824d73d02731a045c69419b814
Chris Craik [Wed, 23 Apr 2014 21:39:06 +0000 (21:39 +0000)]
Merge "Fix translationZ matrix computation"
Winson Chung [Wed, 23 Apr 2014 21:35:32 +0000 (21:35 +0000)]
Merge "Piping through ability for an Activity to remove its own task. (Bug
13735914)"
Selim Gurun [Wed, 23 Apr 2014 21:23:27 +0000 (21:23 +0000)]
Merge "Tune down the linkify false positive rate"
OSDN Git Service
