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

130263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
John Reck
5d039c458c Merge "TIME LORD!" 2014-05-05 19:21:26 +00: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
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
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
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
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
Jose Lima
be2ba85c4f Merge "Allow activities to be visible behind the Home Stack" 2014-05-03 01:06:34 +00:00
Guang Zhu
ce63f59906 am 9284a37d: am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev 
* commit '9284a37d601f8d90e868f6fb032ebb8b4e07029d':
  add getAddress function to return BT mac
 2014-05-03 00:39:06 +00:00
Adam Powell
3feb0419d2 Merge "ListViews in ScrollViews and ScrollViews in ListViews" 2014-05-03 00:36:21 +00:00
Guang Zhu
9284a37d60 am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev 
* commit '1edfd835c2573711587cc77befeefd96083ccba5':
  add getAddress function to return BT mac
 2014-05-03 00:35:26 +00:00
Alan Viverette
223b1e0ba7 Merge "Fix ripple cancel" 2014-05-03 00:35:24 +00:00
Winson Chung
03a9baedc9 Refactoring activity method to update recents values. 
Change-Id: Ic525be207714d34abe0c2d26091c3e46abcd9bad
 2014-05-02 17:34:37 -07:00
Guang Zhu
1edfd835c2 Merge "add getAddress function to return BT mac" into klp-modular-dev 2014-05-03 00:32:58 +00:00
Ruben Brunk
9dfcbb8403 Merge "Revert "camera3: Update CameraMetadata vendor tag handling."" 2014-05-03 00:29:01 +00:00
Ruben Brunk
31efe22b40 Revert "camera3: Update CameraMetadata vendor tag handling." 
This reverts commit e03a7eab1d08c821a516f1c07d29a77797acab68.

Change-Id: I1682b5b0904974f488d3e51c3dbaa8f9f02ac71d
 2014-05-03 00:28:49 +00:00
Alan Viverette
40c3734939 Fix ripple cancel 
BUG: 14495933
Change-Id: Ie3498f35705b70e4c059ff86250cef4746f174da
 2014-05-02 17:25:05 -07:00
Dianne Hackborn
93be005f43 Merge "Bump up priority of system receiving BOOT_COMPLETED." 2014-05-03 00:24:31 +00:00
Adam Powell
96d62aff0f ListViews in ScrollViews and ScrollViews in ListViews 
Dogs and cats, living together, mass hysteria!

Add support for nested scrolling to AbsListView, granting the ability
to both ListView and GridView.

Change-Id: Iae5c0518c5cebe41927720a7a27916ef13ca706e
 2014-05-02 17:16:04 -07:00
Dianne Hackborn
d83a096f29 Bump up priority of system receiving BOOT_COMPLETED. 
Change-Id: I5166f88f11f781914312e867cb653c8ecbefa705
 2014-05-02 16:29:10 -07:00
Igor Murashkin
94814218d2 camera2: Add camera-specific data types used for metadata key/value 
Adds new public API classes:
* InputOutputFormatsMap
* LensShadingMap
* RggbChannelVector
* StreamConfigurationMap
* TonemapCurve

Adds new @hide classes:
* StreamConfiguration
* StreamConfigurationDuration

Minor changes:
* CameraDevice (doc only)
* Preconditions (new @hide function)

Change-Id: I2f3757e2fe9d63e710f51469c650377165fd6631
 2014-05-02 15:55:30 -07:00
Igor Murashkin
b3a78b2ca9 camera2: Add re-usable data types for camera metadata key/values 
Adds new types to public API:
* ColorSpaceTransform
* Range<T>
* SizeF (android.util)
* MeteringRectangle

Minor changes to:
* Size (docs and move to android.util)
* Preconditions (@hide)

Adds helper class:
* HashCodeHelpers

Change-Id: Ied6749a19234f3af9da838f365f8d68d90251aaf
 2014-05-02 15:55:29 -07:00
Ruben Brunk
5295745026 Merge "camera3: Update CameraMetadata vendor tag handling." 2014-05-02 22:23:29 +00:00
Deepanshu Gupta
9862c0b102 am e84f6b5a: (-s ours) am 106c24fb: am c7149708: am bab277cc: am 13542c7e: (-s ours) am 00e0b992: am 75f435b0: am 495c14d8: (-s ours) am 47ad22ed: am 961e3281: am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE] 
* commit 'e84f6b5a4ee22c1106bbf668a6d6853cfbde31d0':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-05-02 22:17:52 +00:00
Deepanshu Gupta
1389b7723a am db176326: (-s ours) am 2f73224c: am b4367eaf: am 5ac33148: am 29376cea: (-s ours) am a996ff5c: am c529b700: am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'db1763266dde346ed99a2f6dfac618c1b4b98c05':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-02 22:17:48 +00:00
Deepanshu Gupta
812922f44f am 85c6a654: (-s ours) am 3df2b07c: am 6241a6ce: am eecb79a8: am 22b47b28: (-s ours) am 16fda528: am b7431172: am 826a215c: (-s ours) am 320f1126: am cf3f108e: am 5be65fda: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '85c6a65471d5ec53a537b56de9924de866c633e3':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-02 22:17:44 +00:00
Deepanshu Gupta
5c67ea4b6c am b8cdabb9: (-s ours) am f9852395: am 00251f77: am d1830eb6: am 57e410d9: (-s ours) am 9f81e73a: am 28ec8b4f: am 0a37981c: (-s ours) am 1b28d8d4: am d642de58: am ec4623d0: Improve text rendering and measurement. [DO NOT MERGE] 
* commit 'b8cdabb990c69ae58bd184bb41f2c1d96735abd5':
  Improve text rendering and measurement. [DO NOT MERGE]
 2014-05-02 22:17:39 +00:00
Deepanshu Gupta
1405277606 am 8298b7f6: (-s ours) am 8c084dde: am 6214d7aa: am 5f0fb2a1: am 4da3827f: (-s ours) am acbff099: am d9076a95: am f4b35c6a: (-s ours) am ef822b3f: am 62a4a1f9: am 2a82a48f: Fix the measurement of text bounds. [DO NOT MERGE] 
* commit '8298b7f649063dcbe3f857c21fcb609adf74f179':
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-05-02 22:17:35 +00:00