47855 Commits

Author SHA1 Message Date
Glenn Kasten
1489b09b64 Merge "AudioTrack constructor/set parameter frameCount is size_t" 2014-02-28 16:18:07 +00:00
Narayan Kamath
e0d10cd923 am d8ccf8b7: am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"
* commit 'd8ccf8b789461e1706d10df44d109849fa974fc5':
  Various format string fixes for 64bit
2014-02-28 13:53:15 +00:00
Narayan Kamath
be094d89db am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"
* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
  Various format string fixes for 64bit
2014-02-28 13:46:53 +00:00
Narayan Kamath
eee2c72f96 Merge "Various format string fixes for 64bit" 2014-02-28 13:41:58 +00:00
Derek Sollenberger
fc92763408 Merge "Fix includes so that they no longer rely on the global Skia includes directories." 2014-02-28 13:23:15 +00:00
Alan Viverette
cb23bce60a Refactor smooth scrolling sub-row calculation and clamp target
BUG: 13205615
Change-Id: If3757be35593a072ba6e92aa9da085330a12fd9d
2014-02-27 16:33:06 -08:00
Glenn Kasten
3118ca9b09 AudioTrack constructor/set parameter frameCount is size_t
Change-Id: Ie92ab0433531b3852747a81d2bfce9625644a2ae
2014-02-27 15:53:50 -08:00
Derek Sollenberger
eece0dda56 Fix includes so that they no longer rely on the global Skia includes directories.
bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
2014-02-27 14:31:29 -05:00
Derek Sollenberger
4915fb22c7 Merge "Cleanup unnecessary includes for libskia." 2014-02-27 18:09:31 +00:00
Mike Lockwood
17c402d694 Merge "Add support for USB devices with multiple configurations and alternate interfaces" 2014-02-27 18:04:38 +00:00
Mike Lockwood
7531aa2235 Add support for USB devices with multiple configurations and alternate interfaces
Added UsbConfiguration class, as well as accessors to UsbDevice to get configuration list
Added methods to UsbDeviceConnection to select configurations and alternate interfaces.

Also added accessors for USB descriptor name strings and fixed some memory leaks in the JNI code.

Bug: 12425052
Change-Id: Idb990f4d5c054a8cb997eb3f440f6da9f83bce05
2014-02-27 09:59:02 -08:00
George Mount
29f75e70d5 Merge "Fix broken link in javadoc." 2014-02-27 17:43:46 +00:00
George Mount
22c89089e6 Fix broken link in javadoc.
Change-Id: I8df3713af727a123bcf9743e59e5f7fe661350ec
2014-02-27 09:41:39 -08:00
John Spurlock
e677d7113f Introduce zen mode.
- New global zen mode setting with three values:
   ZEN_MODE_OFF, ZEN_MODE_LIMITED, ZEN_MODE_FULL
 - Status bar icon (on lhs)  when in _LIMITED / _FULL
 - Rules are hardcoded for now:
   _LIMITED = intercept all notifications except calls/alarms
   _FULL = intercept everything
 - UI affordance in shade to set mode
 - Only one exit condition: "Until you delete this"
 - Intercepted notifications:
   - appear darker in the shade
   - do not cause sound/vibration
   - do not fire fullScreenIntents
   - do not contribute an icon to the status bar

Change-Id: Ic36c95982b483432006bf9dab102a31370382aa9
2014-02-27 11:53:30 -05:00
Derek Sollenberger
950fe8f8d4 Cleanup unnecessary includes for libskia.
The libskia target exports all of its public includes directories so
redefining them here is redundant. Also this cleans up and makes it
obvious where the framework is making using of private Skia headers.

Change-Id: Ie7ecc9ddd3df780bed6b9af54ba58ca58274e043
2014-02-27 16:21:24 +00:00
George Mount
94b5ca811e Merge "Change Activity Scene Transitions to be more automatic redo." 2014-02-27 15:15:06 +00:00
Narayan Kamath
e5f98941ba am 7aec4109: am 7aeb4307: am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '7aec4109c53371e69bec111c69767810f45c301c':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
2014-02-27 13:33:23 +00:00
Narayan Kamath
7aeb43072a am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '2525acf5a9855d748c008268bb26d6f6d5045d84':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
2014-02-27 13:26:39 +00:00
Narayan Kamath
a393735a5d am 2589067d: am 9fc8e6fe: am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit '2589067d10b5f6a67eb1f789b4cf5943914dd9d2':
  Make getAssetInt throw unconditionally.
2014-02-27 13:25:43 +00:00
Narayan Kamath
9fc8e6fe8f am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit 'f61add84c28be06c190d5594a41a7ef84b7666fe':
  Make getAssetInt throw unconditionally.
2014-02-27 13:19:15 +00:00
Narayan Kamath
e4dae5f2c2 Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 2014-02-27 13:18:07 +00:00
Narayan Kamath
2000fe5833 Merge "Make getAssetInt throw unconditionally." 2014-02-27 13:13:08 +00:00
Yohei Yukawa
589800485d Add unit test for InputMethodInfo
This CL adds a unit test to make sure that InputMethodInfo
implements Parcelable correctly.

BUG: 12954290
Change-Id: I0abe8c266b4b035bf8ef4688d11069b355fabe9f
2014-02-27 17:32:48 +09:00
Baligh Uddin
b96b224554 Merge "Import translations. DO NOT MERGE" 2014-02-27 04:34:30 +00:00
Alan Viverette
e6be9c78b5 Always set item type on obtained ListView item views
If a view is scrapped without layout params being set, it will
incorrectly be recycled as item type 0.

BUG: 13212603
Change-Id: I2a42c04ec5065067ab260a0a8afb07207db729f6
2014-02-26 18:16:36 -08:00
Dianne Hackborn
c2248715e3 Merge "Collect per-uid mobile radio usage." 2014-02-27 00:18:00 +00:00
Wonsik Kim
a9499d704c Merge "VideoPlaneView initial implementation" 2014-02-27 00:07:40 +00:00
Dianne Hackborn
d45665bf0b Collect per-uid mobile radio usage.
We now compute radio active time per application, by distributing
the active time across all applications each time the radio goes
down, weighting it by the number of packets transferred.

Per-app radio power use is now computed using this radio active
time.

This also gives us a new metric "ms per packet", which give an
idea of how effectively an application is using the radio.  This
is collected and reported as a new set of stats in the human-
readable checkin.  (It can be computed from the raw checkin data).

Also improve sync reporting to include the sync source as used
in wake locks, not just the component name.

Change-Id: I0b0185fadd1e47ae749090ed36728ab78ac24c5e
2014-02-26 15:53:44 -08:00
Alan Viverette
813d85b82c Fix progress bar tinting, add tint support to ShapeDrawable
Cleans up APIs a little, since I think we may want to add tinting
modes beyond what Porter-Duff can provide. Plus we don't actually
support some of the Porter-Duff modes in hardware.

Change-Id: I2cea1b737cc93607a24842c54eb9f0d8346b29d4
2014-02-26 15:38:51 -08:00
George Mount
e180337ee9 Change Activity Scene Transitions to be more automatic redo.
This reverts commit 206e30cd93afe3eb72ec94178324417db5424ed2
along with removing the additional startActivity* methods
and replaces them with ActivityOptions makeSceneTransitionAnimation
methods.

Change-Id: I52bec31ae3c4cea6d549810ae5a7acd8aea176d8
2014-02-26 15:30:22 -08:00
Ashok Bhat
64d38d9f48 AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen
script

This will allow eglGetDisplay(int) to work on both 32-bit and
64-bit systems when EGL_DEFAULT_DISPLAY is passed as a parameter.

Change-Id: Idf27d6e00d623d331bb2d4d7f85fa450e0db26c9
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-26 19:07:54 +00:00
RoboErik
8fb4cf1ef4 Merge "Move Session apis to android.media.session" 2014-02-26 18:13:35 +00:00
Baligh Uddin
1f1d3fae86 Import translations. DO NOT MERGE
Change-Id: I1b0c2f8d1be740a6cec16fe7ee488211015f4aaa
Auto-generated-cl: translation import
2014-02-26 09:37:40 -08:00
George Mount
206e30cd93 Revert "Change Activity Scene Transitions to be more automatic."
This reverts commit f10587faadb9080a7bf9991cbe04bac5525da482.

Change-Id: I2785a3d2d6b667cad6d61dcbbc1c624161735fa4
2014-02-26 08:56:30 -08:00
Yohann Roussel
1ec1370a5d Merge "Add support.multidex tests app for an update bug." 2014-02-26 16:23:34 +00:00
Yohann Roussel
05e2a94c8b Add support.multidex tests app for an update bug.
The failing scenario is
- install v1
- run
- update to v2
- update to v3
- run
last run was failing with initial multidex library versions because
it's still running on v1 extracted secondary dex files.

Change-Id: Id9811371fc70b0a4e9b49de913ee38d18699b21d
2014-02-26 17:02:13 +01:00
Alan Viverette
14b51940e9 Merge "Constrain starting sub row to list bounds" 2014-02-26 03:04:36 +00:00
Christopher Tate
c900829c17 Merge "Deal with apps known to LocalTransport backend but with no data" 2014-02-26 02:48:09 +00:00
Wonsik Kim
5f8aa41429 VideoPlaneView initial implementation
Note that eventually VideoPlaneView should not inherit from SurfaceView.

Remove a few trailing spaces too.

Change-Id: Ia0a461169d560435a827861be2cc15f1e3ee68fa
2014-02-26 02:45:15 +00:00
Alan Viverette
2546fcf5c9 Constrain starting sub row to list bounds
BUG: 13077653
Change-Id: Id01da055e8502b1447519666eb439d8480437c6c
2014-02-25 18:45:03 -08:00
Christopher Tate
a9b91864a1 Deal with apps known to LocalTransport backend but with no data
An app might have backed something up and later deleted it, in which
case it will have a directory in the LocalTransport bookkeeping but
with no actual dataset.  Skip these packages at restore time, since
we know a priori that there will be nothing to do.

Change-Id: I85853097bc65ed60e5efd217ee6553b50459e445
2014-02-25 17:42:21 -08:00
RoboErik
2f5b057da7 Move Session apis to android.media.session
This is to make it easier to distinguish the new apis from the old
ones.

Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
2014-02-25 16:01:55 -08:00
George Mount
121e25dcf0 Merge "Change Activity Scene Transitions to be more automatic." 2014-02-25 23:47:57 +00:00
Dianne Hackborn
a1f1a3c573 More battery stats.
- Add events for sync.
- Add more descriptive tags for wake events.
- Fix battery reset.
- Fix tracking of wifi data.

Change-Id: Ic07f2a86a5ed33e7da57eb1108c31c777ecd801f
2014-02-25 13:20:07 -08:00
John Spurlock
a77cf87354 Merge "Tabs -> spaces in frameworks/base." 2014-02-25 19:57:33 +00:00
Martijn Coenen
6924c4ef8d Fix NFC docs breakage.
Change-Id: I680dc7974316c77cb1835b5a81f30e6961ba3c49
2014-02-25 11:51:11 -08:00
George Mount
f10587faad Change Activity Scene Transitions to be more automatic.
Shared element transitions are enabled by default
when the Window has a TransitionManager.

Shared element location and size are captured and
transferred to the target Activity.

ActionBar is treated as a shared element.

Change-Id: I0f22ea4e5cbe80254e848444e3f235cb742684f4
2014-02-25 11:12:16 -08:00
Craig Mautner
b5abedbd5c am c407ace3: am d4c819c0: am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev
* commit 'c407ace3019c4e542654cf17fd04d9436d3f3436':
  Clean up activities and displays when done
2014-02-25 18:56:11 +00:00
Craig Mautner
d4c819c002 am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev
* commit 'dd9ce6287eb9ccae8d527e6750c91b0bd47834fc':
  Clean up activities and displays when done
2014-02-25 18:49:37 +00:00
Craig Mautner
dd9ce6287e Merge "Clean up activities and displays when done" into klp-modular-dev 2014-02-25 18:46:01 +00:00