36980 Commits

Author SHA1 Message Date
Alan Viverette
5523db2ea3 Merge "Don't smooth scroll if the adapter is null" 2014-02-28 20:22:53 +00:00
Tim Kilbourn
ce601aee4c am 7489271c: am c405bae9: am 7071786e: Clear child FragmentManagers when destroying Fragments.
* commit '7489271cd12ef04ba19cd2ea31a1e79251b10a08':
  Clear child FragmentManagers when destroying Fragments.
2014-02-28 20:19:16 +00:00
Alan Viverette
2ac93ae919 Don't smooth scroll if the adapter is null
BUG: 13235508
Change-Id: I1ca8a5675aa07b9a987e47a6eacdc0a1e4adde74
2014-02-28 12:18:38 -08:00
Tim Kilbourn
c405bae90d am 7071786e: Clear child FragmentManagers when destroying Fragments.
* commit '7071786e0074bea42b01236f817383cab69c1b63':
  Clear child FragmentManagers when destroying Fragments.
2014-02-28 20:13:11 +00:00
Chad Brubaker
f87b224849 Merge "Remove SO_BINDTODEVICE from VPN protect" 2014-02-28 19:28:45 +00:00
Chris Wren
9f6a372ca0 Merge "create a synthetic 2U heads up notification" 2014-02-28 16:28:53 +00:00
Chris Wren
8fd39ec46b create a synthetic 2U heads up notification
combine the 1U with the action buttons to make a mid-sized notification
bounded to 128dp by the system ui
used for the heads up

Bug: 13208692
Change-Id: I382bb0bd1ce73f35295f05ca2606195986cff1d3
2014-02-28 11:20:11 -05:00
Tim Kilbourn
7071786e00 Clear child FragmentManagers when destroying Fragments.
If Fragment has instantiated a child FragmentManager and is later
detached, it retains its reference to the child FragmentManager which
has been destroyed. This causes an IllegalStateException in the
child FragmentManager if the original Fragment is reattached.

Fixes Issue 42601.

Change-Id: I8db2b1a110a341dc259939723f4c5ec131ca5f1e
2014-02-28 01:05:17 -08: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
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
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
George Mount
94b5ca811e Merge "Change Activity Scene Transitions to be more automatic redo." 2014-02-27 15:15:06 +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
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
RoboErik
8fb4cf1ef4 Merge "Move Session apis to android.media.session" 2014-02-26 18:13:35 +00: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
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
Martijn Coenen
c197019054 Merge "Add an API to manually invoke Android Beam." 2014-02-25 18:43:37 +00:00
Craig Mautner
95da1087ed Clean up activities and displays when done
More maintenance fixes.

Fix bug 13157352.

Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
2014-02-25 10:40:18 -08:00
Hui Lu
d22f23b2d6 am fcf7d3a6: am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit 'fcf7d3a64947a8a0f05ee9e0669abe4a0727f926':
  Reconnect/teardown proxy network connectivity.
2014-02-25 18:03:07 +00:00
Hui Lu
eeb291b7f3 am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit '95e3cba1f66af5594b5bdc210426ced44dd7b7ac':
  Reconnect/teardown proxy network connectivity.
2014-02-25 17:56:42 +00:00
Hui Lu
95e3cba1f6 Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 2014-02-25 17:53:41 +00:00
Narayan Kamath
2d19d202bd Make getAssetInt throw unconditionally.
All callers have been moved over to getNativeAsset, and
this method has been hidden from the public API internally.

Change-Id: I5f29b5ddb4449adadf426e49a4085c7320289a15
2014-02-25 15:48:07 +00:00
John Spurlock
8a985d24ce Tabs -> spaces in frameworks/base.
Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
2014-02-25 09:49:29 -05:00
Kenny Guy
e21c52a8c9 Merge "Hide managed profiles from user switchers." 2014-02-25 13:01:38 +00:00
Nicolas Prevot
1f63810638 Merge "Adding the requiredForProfile flag." 2014-02-25 10:35:25 +00:00
Alan Viverette
6dd4e28b60 Merge "Force measurement in LinearLayout if any views are skipped" 2014-02-25 02:49:02 +00:00
Alan Viverette
65be9cc34c Force measurement in LinearLayout if any views are skipped
BUG: 12249256
Change-Id: I805cc70c4a2982befd9eb625be1378e6a2d9eba6
2014-02-24 18:21:09 -08:00
Dianne Hackborn
7a603b294d Merge "Fix some issues with network usage in battery stats." 2014-02-25 01:07:42 +00:00
Dianne Hackborn
fb7b50a026 Fix some issues with network usage in battery stats.
Change-Id: I8b354872511fcb55cecb2e09aada2eab41a1e202
2014-02-24 17:06:14 -08:00
Zhijun He
cc28a41b48 Camera2: Correct some minor errors in awb region spec
Also correct some other typos.

Change-Id: Ib7ac65cd82d06a20aa47cce10a9976a3ac405142
2014-02-24 15:11:23 -08:00