130437 Commits

Author SHA1 Message Date
Yorke Lee
e9a0d6a859 Fix nested prescrolling bug in ScrollView
mScrollOffset should not be applied to deltaY for the current
MotionEvent. Instead, it should be used to offset the y position
of the next motion event instead.

Change-Id: Iaed85083556d4606300d9a888662c32ab4dbf3ca
2014-05-05 14:29:34 -07:00
Adam Lesinski
ce8083fc51 am 0472fb58: am 34dd2cdd: am f2d2c871: AAPT should not process XML that failed to compile
* commit '0472fb5882cfe55577a169a0f0ff4b8920a839b0':
  AAPT should not process XML that failed to compile
2014-05-05 21:19:04 +00:00
Adam Lesinski
0472fb5882 am 34dd2cdd: am f2d2c871: AAPT should not process XML that failed to compile
* commit '34dd2cdd4142ca8c7463b9f831429b4366fa222a':
  AAPT should not process XML that failed to compile
2014-05-05 21:13:28 +00:00
Adam Lesinski
34dd2cdd41 am f2d2c871: AAPT should not process XML that failed to compile
* commit 'f2d2c871813656012420faa89080d8e3cda1f308':
  AAPT should not process XML that failed to compile
2014-05-05 21:09:49 +00:00
Craig Mautner
6856ef87a5 am 9bb4df3a: am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev
* commit '9bb4df3a7d9ed479f8ef10b08bbc3354a1984aab':
  Pause and resume ActivityView when visibility changes
2014-05-05 21:07:48 +00:00
Craig Mautner
9bb4df3a7d am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev
* commit 'e88097bd00d5710bbfb6c24a934743c8d6cac9cf':
  Pause and resume ActivityView when visibility changes
2014-05-05 21:03:39 +00:00
Craig Mautner
b12646210f am 6dffeb9e: am 8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev
* commit '6dffeb9eeba785dcf738bfabfec334a6c188d104':
  Add null check to embeddedAllowed check
2014-05-05 21:03:30 +00:00
Ashish Sharma
81850c48fd Avoid creating new battery history types because of no separator.
Change-Id: I325743142bee21e4dbca5bf9ed6135b7ca5340ec
2014-05-05 21:00:33 +00:00
Craig Mautner
6dffeb9eeb am 8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev
* commit '8890013ae0473663a6b9591db6230e9038ba6711':
  Add null check to embeddedAllowed check
2014-05-05 20:59:37 +00:00
Craig Mautner
e88097bd00 Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev 2014-05-05 20:58:15 +00:00
Craig Mautner
8890013ae0 Merge "Add null check to embeddedAllowed check" into klp-modular-dev 2014-05-05 20:55:48 +00:00
Adam Powell
9e7a14ddce Merge "Fix a bug in AbsListView nested scrolling support." 2014-05-05 20:35:44 +00:00
Adam Powell
11d0069f92 Fix a bug in AbsListView nested scrolling support.
Bug 14564701

Change-Id: I8cb854b987736e6f141610c8e6e77eb263a718db
2014-05-05 13:28:22 -07:00
George Mount
cac8ce33a9 Merge "Add ImageView-specific shared element activity transition code." 2014-05-05 20:02:53 +00:00
Alan Viverette
c6d2d3a069 Merge "Partial revert "Load device default theme mapping from resources"" 2014-05-05 19:47:49 +00:00
John Reck
f9be77940e Make RenderNodeAnimator and WebView play nice
Change-Id: Ifaefcf510b2d377663fc86f60608d6ec9be8329a
2014-05-05 12:35:30 -07:00
Craig Mautner
05678d5a31 Add null check to embeddedAllowed check
If the component being checked has been removed an NPE will be
thrown. This checks for that situation and handles it.

Fixes bug 14562234.

Change-Id: Ica5713378f356ac8441862d455b7d284ea111212
2014-05-05 12:32:40 -07:00
Alan Viverette
5effd7e89f Partial revert "Load device default theme mapping from resources"
This reverts commit e4ab72d54cf41d16819b72e94d9b0d0d51289647.

Change-Id: Id17170312c75993fc1f7859d52c7e050b2aeaf80
2014-05-05 12:26:03 -07:00
George Mount
080443bcb6 Add ImageView-specific shared element activity transition code.
Bug 14497858

Probably more than 50% of shared elements will be ImageViews and
sharing the scale type and matrix between the two Activities will
simplify shared element transitions.

Also fixed MoveImage, which had a bug when the scale type was FIX_XY.

Change-Id: Ic5548b4d1420ced12507c18edf76c9e50e27a929
2014-05-05 12:25:43 -07:00
John Reck
5d039c458c Merge "TIME LORD!" 2014-05-05 19:21:26 +00:00
Craig Mautner
d13a558397 Pause and resume ActivityView when visibility changes
Once a Surface has been established the activity in an ActivityView
must be paused and resumed as the view goes in and out of visibility
= View.GONE.

Fixes bug 14034658.

Change-Id: Icab43678053c225db70f051dceacd4d024df2153
2014-05-05 12:07:40 -07:00
Christoph Studer
983ce97a5d Merge changes Iffd15e95,Id2db95ec
* changes:
  Log notification clicks
  Add userId to StatusBarNotification key
2014-05-05 19:04:57 +00:00
Adam Lesinski
f2d2c87181 AAPT should not process XML that failed to compile
AAPT would attempt to warn if an unprefixed 'id'
attribute was used in an XML resource file even
if that XML file failed to compile. The result
was undefined behaviour, including crashing the
process.

Change-Id: I1a9464ec937760e8d38bbe1af8d1b5d6b2c105a2
2014-05-05 12:01:21 -07:00
Dianne Hackborn
2059bce9d6 Merge "Further work on voice interaction services." 2014-05-05 18:32:03 +00:00
Dianne Hackborn
c03c9167c2 Further work on voice interaction services.
This makes VoiceInteractionSession a more first-class
concept.  Now the flow is that a VoiceInteractionService
calls startSession() when it wants to begin a session.
This will result in a new VoiceInteractionSession via the
VoiceInteractionSessionService containing it, and the
session at that point an decide what to do.  It can now
show UI, and it is what has access to the startVoiceActivity
API.

Change-Id: Ie2b85b3020ef1206d3f44b335b128d064e8f9935
2014-05-05 11:18:08 -07:00
Jason Monk
f593c9d728 Merge "Add null check on navigation bar visibility" 2014-05-05 18:14:27 +00:00
Jason Monk
db6d7a5971 Merge "Don't show IME Switcher not. if nav bar exists" 2014-05-05 18:09:50 +00:00
John Reck
18f16e6fba TIME LORD!
Bug: 14444180

Change-Id: I68bec3807c4d1c88d5af1aec2fe6907d60b5f2f3
2014-05-05 10:57:04 -07:00
Ruben Brunk
6b003c9e3c Merge "camera3: Update CameraMetadata vendor tag handling." 2014-05-05 17:40:16 +00:00
Zhijun He
4793af5e35 Camera2: make videostabilization type consistent
Make it consistent with availableVideoStabilizationModes and its optical
stabilization relatives.

Change-Id: I6e3834af8a62d4f84fca2d305ac9574052b69db0
2014-05-05 10:39:12 -07:00
David Friedman
26ebd62b57 am 68e048d8: am 20d125de: am fd876194: am 4146d546: 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 developme
* commit '68e048d85a539f1b8531f53b6192d99f0c2b1c47':
  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.
2014-05-05 17:19:14 +00:00
David Friedman
68e048d85a am 20d125de: am fd876194: am 4146d546: 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 '20d125dedb8bde016389ee97a0cefcc97bb02a81':
  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.
2014-05-05 17:16:22 +00:00
David Friedman
20d125dedb am fd876194: am 4146d546: 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 'fd876194cf12352545048f77f626c839cc7ef787':
  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.
2014-05-05 17:12:53 +00:00
Baligh Uddin
8ff936bb51 Import translations. DO NOT MERGE
Change-Id: Ifed118163b8a144fac76be179448479108ff9561
Auto-generated-cl: translation import
2014-05-05 10:08:33 -07:00
David Friedman
fd876194cf am 4146d546: 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 '4146d546a4ab8465970e7c73bf1e9e00767931b6':
  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.
2014-05-05 17:07:55 +00:00
David Friedman
4146d546a4 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-docs 2014-05-05 17:05:22 +00:00
Baligh Uddin
7808437f42 Import translations. DO NOT MERGE
Change-Id: I406e993a5b1a7225be0da7bbc25bdeb6cb7e98ae
Auto-generated-cl: translation import
2014-05-05 09:25:01 -07:00
John Spurlock
29e594c520 Merge "Log all notification interceptions." 2014-05-05 13:24:08 +00:00
John Spurlock
c8d7ab9ff9 Log all notification interceptions.
Change-Id: I036a4b5eb7c5a3ce2addb0a16d9d6806e3952929
2014-05-05 09:22:57 -04:00
John Spurlock
efc1a289c6 Cleanup logspam.
Change-Id: I21b39458147e911da3ab7a260c13abf7ec4eea5d
2014-05-05 08:43:08 -04:00
Zhijun He
dab4049383 Merge "Camera2: Minor update for hyperfocalDistance spec" 2014-05-04 23:38:28 +00:00
Zhijun He
b41fcc2506 Camera2: Minor update for hyperfocalDistance spec
Doc only change.

Change-Id: I1b425ab739f10d5e2ba9403baf918f3ee6150d71
2014-05-04 16:29:57 -07:00
Jinsuk Kim
d0e2095180 Update current.txt to fix the broken build
Change-Id: Ifaf9e2221791907b953995c5c4066528746811b3
2014-05-05 08:16:11 +09:00
Jinsuk Kim
043aa252cf Merge "Define Feature action for obtaining info on a new CEC device" 2014-05-04 21:51:44 +00:00
Ruben Brunk
32ef3ae085 camera3: Update CameraMetadata vendor tag handling.
Bug: 12134423
Change-Id: I19380fb5acc3e23a6181d8f858c13457993480fc
2014-05-02 20:34:41 -07:00
Winson Chung
c74b3cb6f0 Merge "Adding ability to load a search widget into Recents." 2014-05-03 01:58:10 +00:00
Winson Chung
f7bca430d9 Adding ability to load a search widget into Recents.
Change-Id: Ie17d9b9a47c979774b39a37e87f75d9dadc79ad9
2014-05-02 18:45:40 -07:00
Winson Chung
7e78b8d3db Merge "Incorporating theme colors into task views." 2014-05-03 01:43:01 +00:00
Winson Chung
3e586e4621 Merge "Refactoring activity method to update recents values." 2014-05-03 01:42:42 +00:00
Winson Chung
f5e22e71cb Incorporating theme colors into task views.
Change-Id: Ie7166d78dacabe4bff7afdade2d1da9d0651e403
2014-05-02 18:35:35 -07:00