drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,709 Commits 1 Branch 0 Tags
Commit Graph

130709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Koh
f8a10d775e Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev 2014-05-05 22:38:17 +00:00
Justin Koh
fd04632ab5 am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 
* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
  Hide getDeviceGlobalActionKeyTimeout
 2014-05-05 22:38:13 +00:00
Justin Koh
9cb3b162eb Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 2014-05-05 22:38:06 +00:00
Justin Koh
3caf925824 Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 2014-05-05 22:33:29 +00:00
Justin Koh
19f274f699 am 68ca1464: (-s ours) am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
* commit '68ca14648c88d84080cafae02c9bc5cf3448096a':
  Hide NsdServiceInfo additions for KKWT DO NOT MERGE
 2014-05-05 22:24:46 +00:00
Justin Koh
68ca14648c am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
* commit 'ed23c5bc12b4110435b1e6f5fb9b82716109136e':
  Hide NsdServiceInfo additions for KKWT DO NOT MERGE
 2014-05-05 22:21:03 +00:00
Justin Koh
e5238f53f0 Hide HDMI CEC from KKWT DO NOT MERGE 
Hide HDMI CEC from KKWT.
Bug: 14116162

Change-Id: I086a5e51bd848a5097ccb0c47900fde30db2e7aa
 2014-05-05 22:19:19 +00:00
Justin Koh
e647dd354e Hide UsbDevice changes in KKWT DO NOT MERGE 
Hide UsbDevice changes in KKWT.
Bug: 14116162

Change-Id: I1582b9d536b243fa18beca6fdd8f379f9e32e137
 2014-05-05 22:19:05 +00:00
Justin Koh
ed23c5bc12 Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
Hide NsdServiceInfo additions for KKWT.
Bug: 14116162

Change-Id: I98755a2524168be5e833a634192fd49ff3c32346
 2014-05-05 22:18:42 +00:00
Alan Viverette
f4ce9e115e Merge "Add support for popups overlapping anchors" 2014-05-05 22:05:54 +00:00
Chris Craik
81997fef18 am 3cb74d21: am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail" 
* commit '3cb74d21b2ac2427e805f72a113e8d7a2cc460f3':
  libhwui: Handle the blurImage() implement once RS::init fail
 2014-05-05 21:53:56 +00:00
Justin Koh
618f30db3e Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE 
Hide getRequiredPermission in android.hardware.Sensor.
Bug: 14116162

Change-Id: I1e5c8361f6d0710c5da78d9506f70fa40a814b92
 2014-05-05 14:51:55 -07:00
Chris Craik
3cb74d21b2 am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail" 
* commit '5d8343b8e27e766b5bfaaed2f9b1952c0d15da8d':
  libhwui: Handle the blurImage() implement once RS::init fail
 2014-05-05 21:50:34 +00:00
Chris Craik
5d8343b8e2 am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail" 
* commit 'a85db5ab785c59726c3644999801e48f449714f3':
  libhwui: Handle the blurImage() implement once RS::init fail
 2014-05-05 21:46:48 +00:00
Chris Craik
a85db5ab78 Merge "libhwui: Handle the blurImage() implement once RS::init fail" 2014-05-05 21:44:08 +00:00
Justin Koh
1aa59f86ca Hide getDeviceGlobalActionKeyTimeout 
Hide getDeviceGlobalActionKeyTimeout, as requested. Remove mention from
@deprecated notice.
Bug: 14441321

Change-Id: Ic6e84e718c2eaa15a86d8cd4d13645be88490b61
 2014-05-05 14:40:56 -07:00
Alan Viverette
560f17098f Add support for popups overlapping anchors 
BUG: 14471731
Change-Id: I16e8d76caedfebd0c38b8c0b22cd9619d70877c8
 2014-05-05 14:40:07 -07:00
Winson Chung
da5b84c8d3 Exposing the API to support widgets in Recents. 
Change-Id: I2d53f226dbc328f0dbda7006eac647c6468c6b36
 2014-05-05 14:33:44 -07:00
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
Vinod Krishnan
8afb23cbf6 Adding a HeartRate Feature 
Bug: 14140142

Change-Id: I080bf12995355eac7621ef46e1a4a64d1f865500
 2014-05-05 11:53:28 -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