OSDN Git Service
Jean-Michel Trivi [Sat, 13 Sep 2014 00:08:29 +0000 (00:08 +0000)]
am
cad4fd5e: am
3d88a9c6: Merge "more AudioAttributes javadoc" into lmp-dev
* commit '
cad4fd5ed25a6d2b55b67161db1a9ad749158269':
more AudioAttributes javadoc
vandwalle [Sat, 13 Sep 2014 00:08:25 +0000 (00:08 +0000)]
am
36d21f41: am
e62a18e5: Merge "various fixes:" into lmp-dev
* commit '
36d21f41abe13907e2647459d98af6802d36b232':
various fixes:
Jean-Michel Trivi [Fri, 12 Sep 2014 23:54:00 +0000 (23:54 +0000)]
am
3d88a9c6: Merge "more AudioAttributes javadoc" into lmp-dev
* commit '
3d88a9c65f0d808bb448e8e690a86fccfe8d265d':
more AudioAttributes javadoc
vandwalle [Fri, 12 Sep 2014 23:53:55 +0000 (23:53 +0000)]
am
e62a18e5: Merge "various fixes:" into lmp-dev
* commit '
e62a18e572b745c6b92794bfa3ac41eaa5c61ee4':
various fixes:
Matthew Williams [Fri, 12 Sep 2014 23:50:58 +0000 (23:50 +0000)]
am
2d200768: am
7e84b1a4: Merge "Fix NPE in JobServiceContext" into lmp-dev
* commit '
2d200768cd594cb543cb67547da67fa5365d4dc7':
Fix NPE in JobServiceContext
Jae Seo [Fri, 12 Sep 2014 23:50:54 +0000 (23:50 +0000)]
am
98642c20: am
5e74ef0e: Merge "TIF: Add a system API to retrieve HDMI device information" into lmp-dev
* commit '
98642c2092813897c7dd2e40d7da8c138f3677db':
TIF: Add a system API to retrieve HDMI device information
George Mount [Fri, 12 Sep 2014 23:50:50 +0000 (23:50 +0000)]
am
356192d3: am
87483e5e: Merge "Made Transitions act only the views that they target." into lmp-dev
* commit '
356192d3c3806a6040cd1c2c46380b43b8c68363':
Made Transitions act only the views that they target.
Alan Viverette [Fri, 12 Sep 2014 23:50:47 +0000 (23:50 +0000)]
am
3e267253: am
f559f89c: Merge "Report button opacity for current state, fix button shadows" into lmp-dev
* commit '
3e26725365b0eb61ca0b0afe302c0986277b89a8':
Report button opacity for current state, fix button shadows
Jean-Michel Trivi [Fri, 12 Sep 2014 23:45:22 +0000 (23:45 +0000)]
Merge "more AudioAttributes javadoc" into lmp-dev
vandwalle [Fri, 12 Sep 2014 23:34:28 +0000 (23:34 +0000)]
Merge "various fixes:" into lmp-dev
Craig Mautner [Fri, 12 Sep 2014 23:33:43 +0000 (23:33 +0000)]
am
e5d4568a: am
1260584f: Merge "Rework the task affiliate chain validation" into lmp-dev
* commit '
e5d4568a7982949c070fca0f2dc95ea532aab960':
Rework the task affiliate chain validation
Robert Greenwalt [Fri, 12 Sep 2014 23:33:39 +0000 (23:33 +0000)]
am
5f6f23a5: am
5710ec48: Merge "Make status bar indicators reflect the network actually in use." into lmp-dev
* commit '
5f6f23a59dbe259094d14c5b3dd62f1fedef1f6b':
Make status bar indicators reflect the network actually in use.
Robert Greenwalt [Fri, 12 Sep 2014 23:33:30 +0000 (23:33 +0000)]
am
361f5279: am
3234c20e: Merge "Update Inet state when NetworkMonitor re-evaluates a network." into lmp-dev
* commit '
361f527918afba30133e4cf30cb01e5f6b76a0e7':
Update Inet state when NetworkMonitor re-evaluates a network.
Christopher Tate [Fri, 12 Sep 2014 23:33:26 +0000 (23:33 +0000)]
am
340e1735: am
89b91209: Merge "Track enable/disable of transport components" into lmp-dev
* commit '
340e1735161be7d0f849565ea786f5a4df8bebfd':
Track enable/disable of transport components
ztenghui [Fri, 12 Sep 2014 23:33:23 +0000 (23:33 +0000)]
am
bd25424c: am
84a7c1cc: Merge "Update the shadow strength" into lmp-dev
* commit '
bd25424c2c71d88ccb9a57322c69d6da2d22d45c':
Update the shadow strength
Jeff Sharkey [Fri, 12 Sep 2014 23:33:20 +0000 (23:33 +0000)]
am
fd588e2d: am
1ad40a96: Merge "Fix boot loop when deriving device name." into lmp-dev
* commit '
fd588e2df0cca5a913cc12583ba708f7ab47ac61':
Fix boot loop when deriving device name.
Robert Greenwalt [Fri, 12 Sep 2014 23:33:11 +0000 (23:33 +0000)]
am
7b479e94: am
da8158b1: Merge "Better handling of unvalidated networks." into lmp-dev
* commit '
7b479e949379667866f281d3fccbfdaeddc72cea':
Better handling of unvalidated networks.
Jeff Sharkey [Fri, 12 Sep 2014 23:33:01 +0000 (23:33 +0000)]
am
5f687d96: am
4a06f52a: Merge "Add xxxhdpi assets for DocumentsUI." into lmp-dev
* commit '
5f687d9634681761c4deb133e5c31b68ec7694db':
Add xxxhdpi assets for DocumentsUI.
Matthew Williams [Fri, 12 Sep 2014 23:31:04 +0000 (23:31 +0000)]
am
7e84b1a4: Merge "Fix NPE in JobServiceContext" into lmp-dev
* commit '
7e84b1a4a4e72f1b4953c169cec4599e567c9203':
Fix NPE in JobServiceContext
Jae Seo [Fri, 12 Sep 2014 23:31:00 +0000 (23:31 +0000)]
am
5e74ef0e: Merge "TIF: Add a system API to retrieve HDMI device information" into lmp-dev
* commit '
5e74ef0eb4a333d4f6a0ab09f2ed6b659018e5c6':
TIF: Add a system API to retrieve HDMI device information
George Mount [Fri, 12 Sep 2014 23:30:55 +0000 (23:30 +0000)]
am
87483e5e: Merge "Made Transitions act only the views that they target." into lmp-dev
* commit '
87483e5ea1e08467172d82f8707f8f2470107507':
Made Transitions act only the views that they target.
Alan Viverette [Fri, 12 Sep 2014 23:30:51 +0000 (23:30 +0000)]
am
f559f89c: Merge "Report button opacity for current state, fix button shadows" into lmp-dev
* commit '
f559f89c3b4f28f83b163e957b0d2296578431a9':
Report button opacity for current state, fix button shadows
Matthew Williams [Fri, 12 Sep 2014 23:26:39 +0000 (23:26 +0000)]
Merge "Fix NPE in JobServiceContext" into lmp-dev
Matthew Williams [Fri, 12 Sep 2014 21:40:18 +0000 (14:40 -0700)]
Fix NPE in JobServiceContext
BUG:
17485390
The VERB_BINDING timeout that is set to wait for onBind() to complete
wasn't being cleared when onBind() returns false, i.e. that the service wasn't
available to be bound to.
This led to an NPE when the stale timeout expired. Fix is to clear the timeout
when onBind fails.
Change-Id: I318ca5ce1f3e12b170f7f256608ea7e28f3f120a
Jae Seo [Fri, 12 Sep 2014 23:24:06 +0000 (23:24 +0000)]
Merge "TIF: Add a system API to retrieve HDMI device information" into lmp-dev
George Mount [Fri, 12 Sep 2014 23:19:15 +0000 (23:19 +0000)]
Merge "Made Transitions act only the views that they target." into lmp-dev
Jae Seo [Fri, 12 Sep 2014 23:09:04 +0000 (16:09 -0700)]
TIF: Add a system API to retrieve HDMI device information
Bug:
17487782
Change-Id: I53995735fa190c40819ff352a8b98765a6f7753f
George Mount [Wed, 10 Sep 2014 17:58:08 +0000 (10:58 -0700)]
Made Transitions act only the views that they target.
Bug
17465989
Bug
17452585
Change-Id: I2f921e98f68df3d549a370179c0a4488d56923ad
Alan Viverette [Fri, 12 Sep 2014 23:14:32 +0000 (23:14 +0000)]
Merge "Report button opacity for current state, fix button shadows" into lmp-dev
Craig Mautner [Fri, 12 Sep 2014 23:14:04 +0000 (23:14 +0000)]
am
1260584f: Merge "Rework the task affiliate chain validation" into lmp-dev
* commit '
1260584f00c550b6aa8c0a4d483ced34fd3b6bbf':
Rework the task affiliate chain validation
Robert Greenwalt [Fri, 12 Sep 2014 23:14:00 +0000 (23:14 +0000)]
am
5710ec48: Merge "Make status bar indicators reflect the network actually in use." into lmp-dev
* commit '
5710ec483d879d833f19c25eef4d944161ec5a6e':
Make status bar indicators reflect the network actually in use.
Robert Greenwalt [Fri, 12 Sep 2014 23:13:56 +0000 (23:13 +0000)]
am
3234c20e: Merge "Update Inet state when NetworkMonitor re-evaluates a network." into lmp-dev
* commit '
3234c20e5eaea49559b31db88ef186fe5440d5a2':
Update Inet state when NetworkMonitor re-evaluates a network.
Christopher Tate [Fri, 12 Sep 2014 23:13:52 +0000 (23:13 +0000)]
am
89b91209: Merge "Track enable/disable of transport components" into lmp-dev
* commit '
89b912093244837e9f400705099ac4ed22e6c764':
Track enable/disable of transport components
ztenghui [Fri, 12 Sep 2014 23:13:48 +0000 (23:13 +0000)]
am
84a7c1cc: Merge "Update the shadow strength" into lmp-dev
* commit '
84a7c1cc849f915710e95d93c4afa5e6980395c9':
Update the shadow strength
Jeff Sharkey [Fri, 12 Sep 2014 23:13:44 +0000 (23:13 +0000)]
am
1ad40a96: Merge "Fix boot loop when deriving device name." into lmp-dev
* commit '
1ad40a966096c277123cf3d15a4ccdb2cd8af566':
Fix boot loop when deriving device name.
Robert Greenwalt [Fri, 12 Sep 2014 23:13:40 +0000 (23:13 +0000)]
am
da8158b1: Merge "Better handling of unvalidated networks." into lmp-dev
* commit '
da8158b1f4b87dac9838f1bb7c515ba6b2b7dd3b':
Better handling of unvalidated networks.
Jeff Sharkey [Fri, 12 Sep 2014 23:13:35 +0000 (23:13 +0000)]
am
4a06f52a: Merge "Add xxxhdpi assets for DocumentsUI." into lmp-dev
* commit '
4a06f52aa174d411d22c9999742a93bf2d2b7099':
Add xxxhdpi assets for DocumentsUI.
Alan Viverette [Fri, 12 Sep 2014 23:13:32 +0000 (16:13 -0700)]
Report button opacity for current state, fix button shadows
BUG:
17433604
Change-Id: I25e0bd9b96e09ed2a4d85476b60f459e7cc33002
Craig Mautner [Fri, 12 Sep 2014 23:08:33 +0000 (23:08 +0000)]
Merge "Rework the task affiliate chain validation" into lmp-dev
Robert Greenwalt [Fri, 12 Sep 2014 23:04:49 +0000 (23:04 +0000)]
Merge "Make status bar indicators reflect the network actually in use." into lmp-dev
George Mount [Fri, 12 Sep 2014 23:04:25 +0000 (23:04 +0000)]
am
9e5653ff: am
17506bdb: Merge "Allow Path Animations to support overshooting." into lmp-dev
* commit '
9e5653ff026d11ce2039f0bffcc9a38ac9e77eff':
Allow Path Animations to support overshooting.
Dianne Hackborn [Fri, 12 Sep 2014 23:04:21 +0000 (23:04 +0000)]
am
412e9c9c: am
8b01fb7e: Merge "Fix issue #
17479850: AppOpsManager.checkPackage() allows..." into lmp-dev
* commit '
412e9c9cec779472f33ae54bc8a6557b69ab00fc':
Fix issue #
17479850: AppOpsManager.checkPackage() allows...
Adam Powell [Fri, 12 Sep 2014 23:04:18 +0000 (23:04 +0000)]
am
e4474237: am
af7ba5de: Merge "Add contentDescription for material action mode close button" into lmp-dev
* commit '
e4474237dfc0c13c357659c42b70f026e773b530':
Add contentDescription for material action mode close button
Tsuwei Chen [Fri, 12 Sep 2014 23:04:15 +0000 (23:04 +0000)]
am
187035ae: am
4290fb7b: Merge "Handle user privacy properly during network initiated requests. Bug:
16131208" into lmp-dev
* commit '
187035ae176498c811301dc8214d5c99837b1d40':
Handle user privacy properly during network initiated requests. Bug:
16131208
Dianne Hackborn [Fri, 12 Sep 2014 23:04:11 +0000 (23:04 +0000)]
am
0e719e05: am
a561b237: Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev
* commit '
0e719e05280bfc48fa09ead5b141ae09f354922c':
Allow throwing UnsupportedOperationException across Binder.
Robert Greenwalt [Fri, 12 Sep 2014 23:03:36 +0000 (23:03 +0000)]
Merge "Update Inet state when NetworkMonitor re-evaluates a network." into lmp-dev
Christopher Tate [Fri, 12 Sep 2014 23:03:29 +0000 (23:03 +0000)]
Merge "Track enable/disable of transport components" into lmp-dev
ztenghui [Fri, 12 Sep 2014 23:02:31 +0000 (23:02 +0000)]
Merge "Update the shadow strength" into lmp-dev
Paul Jensen [Fri, 5 Sep 2014 16:06:44 +0000 (12:06 -0400)]
Update Inet state when NetworkMonitor re-evaluates a network.
Previously the Inet state (the little exclamation mark beside the WiFi
and Cellular bars) only transitioned from bad to good once. With this
change it can transition back to bad (and later to good again) if a network
re-evaluation is triggered, say by ConnectivityManager.reportBadNetwork.
Also, avoid triggering re-evaluation in two unwanted cases.
bug:
16214361
Change-Id: I7856724249ffcbb0945276dcf45019876231fdaf
Craig Mautner [Fri, 12 Sep 2014 19:45:05 +0000 (12:45 -0700)]
Rework the task affiliate chain validation
The old chain was problematic. It started verification at the end of
the chain and then went no further. Then it went back down the
chain to the beginning with no checks. It also removed entries and
tried to add them back past the end of the ArrayList during boot
which caused the system process to shut down.
This method uses the ordering imposed by taskIds which is the same
order that the tasks were created. It fixes up and notes dropped
links and then reconstructs the list correctly.
Fixes bug
17467284.
Change-Id: I746ec2cdcc7ac6403278cfefc7a6db9b5549d226
Jeff Sharkey [Fri, 12 Sep 2014 23:00:46 +0000 (23:00 +0000)]
Merge "Fix boot loop when deriving device name." into lmp-dev
Robert Greenwalt [Fri, 12 Sep 2014 23:00:36 +0000 (23:00 +0000)]
Merge "Better handling of unvalidated networks." into lmp-dev
Jeff Sharkey [Fri, 12 Sep 2014 23:00:04 +0000 (23:00 +0000)]
Merge "Add xxxhdpi assets for DocumentsUI." into lmp-dev
George Mount [Fri, 12 Sep 2014 22:58:53 +0000 (22:58 +0000)]
am
17506bdb: Merge "Allow Path Animations to support overshooting." into lmp-dev
* commit '
17506bdb89a323a31e27cbff24fec4c819a71582':
Allow Path Animations to support overshooting.
Dianne Hackborn [Fri, 12 Sep 2014 22:58:49 +0000 (22:58 +0000)]
am
8b01fb7e: Merge "Fix issue #
17479850: AppOpsManager.checkPackage() allows..." into lmp-dev
* commit '
8b01fb7eeeec0431cfb5f51e191a1418423f88ed':
Fix issue #
17479850: AppOpsManager.checkPackage() allows...
Jean-Michel Trivi [Fri, 12 Sep 2014 17:07:05 +0000 (10:07 -0700)]
more AudioAttributes javadoc
Expand the AudioAttributes and associated Builder javadoc.
Bug
17059703
Change-Id: I81b8d48a3b5b3c203f02da3e37228e5ef7b5451d
Jeff Sharkey [Fri, 12 Sep 2014 22:56:30 +0000 (15:56 -0700)]
Fix boot loop when deriving device name.
Bug:
17490408
Change-Id: If1cc25a341eed4e41a7bf170bab077203fa19d15
Adam Powell [Fri, 12 Sep 2014 22:50:16 +0000 (22:50 +0000)]
am
af7ba5de: Merge "Add contentDescription for material action mode close button" into lmp-dev
* commit '
af7ba5dee4454f946ba8e2a3a87205a07bf63171':
Add contentDescription for material action mode close button
Tsuwei Chen [Fri, 12 Sep 2014 22:50:12 +0000 (22:50 +0000)]
am
4290fb7b: Merge "Handle user privacy properly during network initiated requests. Bug:
16131208" into lmp-dev
* commit '
4290fb7b4499c5ec01a6df3a20de7a8fd63bdd97':
Handle user privacy properly during network initiated requests. Bug:
16131208
Dianne Hackborn [Fri, 12 Sep 2014 22:50:08 +0000 (22:50 +0000)]
am
a561b237: Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev
* commit '
a561b2377fd1f8749a30fe19d6df5e3d8afc3292':
Allow throwing UnsupportedOperationException across Binder.
George Mount [Fri, 12 Sep 2014 22:48:27 +0000 (22:48 +0000)]
Merge "Allow Path Animations to support overshooting." into lmp-dev
George Mount [Fri, 12 Sep 2014 20:21:32 +0000 (13:21 -0700)]
Allow Path Animations to support overshooting.
Bug
17458698
Change-Id: I7a29fc8932a28121d7db8b3bf695d91a55ef059b
Dianne Hackborn [Fri, 12 Sep 2014 22:45:00 +0000 (22:45 +0000)]
Merge "Fix issue #
17479850: AppOpsManager.checkPackage() allows..." into lmp-dev
Adam Powell [Fri, 12 Sep 2014 22:43:46 +0000 (22:43 +0000)]
Merge "Add contentDescription for material action mode close button" into lmp-dev
Dianne Hackborn [Fri, 12 Sep 2014 22:38:33 +0000 (15:38 -0700)]
Fix issue #
17479850: AppOpsManager.checkPackage() allows...
...root or shell to claim any package name
Re-arrange so checkPackage() doesn't go through the path where
the package name will be forced for root and shell uids.
Change-Id: I450cd6ac8148afd75b526724afdf46ab63de4c43
Svetoslav [Fri, 12 Sep 2014 22:37:33 +0000 (22:37 +0000)]
am
f62245c9: am
60eed0e5: Merge "Fix crash in spooler if printing app dies." into lmp-dev
* commit '
f62245c9caffac1cc6fefedbf4758d6e9bdcba9b':
Fix crash in spooler if printing app dies.
Guang Zhu [Fri, 12 Sep 2014 22:37:29 +0000 (22:37 +0000)]
am
d33787bb: am
336a9316: Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev
* commit '
d33787bb876d4c8cfe55c7374791369dc68acef4':
do not allow monkey to flip OEM unlock flag
ztenghui [Fri, 12 Sep 2014 22:37:26 +0000 (22:37 +0000)]
am
21c8e9ca: am
2bb77b5a: Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev
* commit '
21c8e9ca4410a0ca303ef678f1804a93fdf8778e':
Add root alpha and animation to (Animated)VectorDrawable
Tsuwei Chen [Fri, 12 Sep 2014 22:36:52 +0000 (22:36 +0000)]
Merge "Handle user privacy properly during network initiated requests. Bug:
16131208" into lmp-dev
Dianne Hackborn [Fri, 12 Sep 2014 22:35:47 +0000 (22:35 +0000)]
Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev
Adam Powell [Fri, 12 Sep 2014 22:31:32 +0000 (15:31 -0700)]
Add contentDescription for material action mode close button
Bug
17487633
Change-Id: Ib61723719f3a3b076ac8136e578748cfa6db8770
ztenghui [Fri, 12 Sep 2014 22:09:32 +0000 (15:09 -0700)]
Update the shadow strength
b/
17486691
Change-Id: I8e8f0b64e757772c18f038f6b329ef91a4e155a5
Svetoslav [Fri, 12 Sep 2014 22:27:51 +0000 (22:27 +0000)]
am
60eed0e5: Merge "Fix crash in spooler if printing app dies." into lmp-dev
* commit '
60eed0e500c2d5964431d9afd6b72b40040448ed':
Fix crash in spooler if printing app dies.
Guang Zhu [Fri, 12 Sep 2014 22:27:47 +0000 (22:27 +0000)]
am
336a9316: Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev
* commit '
336a93165a5e3383b6cf2479222cc18ae85aedaf':
do not allow monkey to flip OEM unlock flag
ztenghui [Fri, 12 Sep 2014 22:27:43 +0000 (22:27 +0000)]
am
2bb77b5a: Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev
* commit '
2bb77b5a90b84c0fbe9055799dabf359b4e7d3ff':
Add root alpha and animation to (Animated)VectorDrawable
Svetoslav [Fri, 12 Sep 2014 22:23:39 +0000 (22:23 +0000)]
Merge "Fix crash in spooler if printing app dies." into lmp-dev
George Mount [Fri, 12 Sep 2014 22:20:37 +0000 (22:20 +0000)]
am
423803a3: am
9032c757: Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev
* commit '
423803a3b14206eeb36f259b81d274f6dde7f1ca':
Fixed: getDecor() NullPointeExceptions.
Amith Yamasani [Fri, 12 Sep 2014 22:20:31 +0000 (22:20 +0000)]
am
4b370408: am
849e1a9c: Merge "Prevent device owner registration after setup is complete" into lmp-dev
* commit '
4b370408a507331df41223b1e48b1fa58cc9a413':
Prevent device owner registration after setup is complete
Yin-Chia Yeh [Fri, 12 Sep 2014 22:20:27 +0000 (22:20 +0000)]
am
2f0c2116: am
e3505a3d: Merge "Camera2: add toString for TonemapCurve" into lmp-dev
* commit '
2f0c2116fed66e8c25858f9d51c048b64782e728':
Camera2: add toString for TonemapCurve
George Mount [Fri, 12 Sep 2014 22:20:24 +0000 (22:20 +0000)]
am
4bedf189: am
cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev
* commit '
4bedf189a04edbbba32404cde11661f9ebc285c9':
Reset the alpha for offscreen views.
Guang Zhu [Fri, 12 Sep 2014 22:20:19 +0000 (22:20 +0000)]
Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev
Adam Powell [Fri, 12 Sep 2014 22:20:20 +0000 (22:20 +0000)]
am
000529e2: am
91089aa5: Merge "Make Toolbars eat touch events" into lmp-dev
* commit '
000529e25d3fc6a18aaf63e552fb41bb4a9fba2d':
Make Toolbars eat touch events
Guang Zhu [Fri, 12 Sep 2014 22:14:00 +0000 (15:14 -0700)]
do not allow monkey to flip OEM unlock flag
Bug:
11435021
Change-Id: I3a6865bc6c9fde245d8f4af3230716eac4a3f1b1
George Mount [Fri, 12 Sep 2014 22:13:11 +0000 (22:13 +0000)]
am
9032c757: Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev
* commit '
9032c75779ea43428b84cd959cc62a219f4d2612':
Fixed: getDecor() NullPointeExceptions.
Amith Yamasani [Fri, 12 Sep 2014 22:13:07 +0000 (22:13 +0000)]
am
849e1a9c: Merge "Prevent device owner registration after setup is complete" into lmp-dev
* commit '
849e1a9c39284ea016d5576f63676748eff36c12':
Prevent device owner registration after setup is complete
ztenghui [Fri, 12 Sep 2014 22:12:01 +0000 (22:12 +0000)]
Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev
ztenghui [Thu, 11 Sep 2014 21:34:20 +0000 (14:34 -0700)]
Add root alpha and animation to (Animated)VectorDrawable
b/
17393626
Change-Id: If6a28b072f7d4bcb2b57022d86ec784f4c0d78f1
George Mount [Fri, 12 Sep 2014 22:02:36 +0000 (22:02 +0000)]
Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev
Christopher Tate [Thu, 11 Sep 2014 22:33:05 +0000 (15:33 -0700)]
Track enable/disable of transport components
For fallback / rollback of backup transport selection we need to
handle live enable/disable of legacy or superseded transports.
We now watch for component enable state changes in packages that
host transports, and rebind as needed.
The semantics for selecting the current transport have also been
adjusted. We no longer require that the selected transport be
live and currently bound in order to be designated as the active
instance. This prevents nondeterministic races around upgrade
and replacement.
Bug
17136637
Change-Id: Idaf45cf4522a23576444e6b11626ee3f7f47c36c
Yin-Chia Yeh [Fri, 12 Sep 2014 22:00:48 +0000 (22:00 +0000)]
am
e3505a3d: Merge "Camera2: add toString for TonemapCurve" into lmp-dev
* commit '
e3505a3d5e8968eaad68fd12717696f17e9414f9':
Camera2: add toString for TonemapCurve
George Mount [Fri, 12 Sep 2014 22:00:44 +0000 (22:00 +0000)]
am
cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev
* commit '
cc8973e45b989fc2380acbc9773e4b1208692891':
Reset the alpha for offscreen views.
Adam Powell [Fri, 12 Sep 2014 22:00:40 +0000 (22:00 +0000)]
am
91089aa5: Merge "Make Toolbars eat touch events" into lmp-dev
* commit '
91089aa5f78c8c6b90a3a519cd5512c458872969':
Make Toolbars eat touch events
George Mount [Fri, 12 Sep 2014 22:00:28 +0000 (22:00 +0000)]
am
38c947ff: am
f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev
* commit '
38c947ffb8dda2e566a0a86c6708a94c1e3395e9':
Changed method name to match Activity's method name.
Amith Yamasani [Fri, 12 Sep 2014 21:59:45 +0000 (21:59 +0000)]
Merge "Prevent device owner registration after setup is complete" into lmp-dev
Tsuwei Chen [Wed, 10 Sep 2014 22:33:34 +0000 (15:33 -0700)]
Handle user privacy properly during network initiated requests.
Bug:
16131208
Change-Id: Ic6f83fcf24eef9e0e26e303bb652651f0dc2970a
Yin-Chia Yeh [Fri, 12 Sep 2014 21:55:11 +0000 (21:55 +0000)]
Merge "Camera2: add toString for TonemapCurve" into lmp-dev
George Mount [Fri, 12 Sep 2014 21:52:27 +0000 (21:52 +0000)]
Merge "Reset the alpha for offscreen views." into lmp-dev
Jeff Sharkey [Fri, 12 Sep 2014 18:31:21 +0000 (11:31 -0700)]
Add xxxhdpi assets for DocumentsUI.
Bug:
17486169
Change-Id: I26fd257ab9404b1c3985ee6861c9b81ec5e581bc
Adam Powell [Fri, 12 Sep 2014 21:49:24 +0000 (21:49 +0000)]
Merge "Make Toolbars eat touch events" into lmp-dev
George Mount [Fri, 12 Sep 2014 21:43:42 +0000 (21:43 +0000)]
am
f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev
* commit '
f607a73b9cfe059739b245d8aff70ed2747334c6':
Changed method name to match Activity's method name.