6323 Commits

Author SHA1 Message Date
RoboErik
8ae0f34db9 Adds a TransportController and TransportPerformer to session
This makes transport controls a primitive interface on sessions with
a way to create the performer, register callbacks, and send commands
and updates between controllers and performers. This still needs some
cleanup but has been tested with OneMedia.

Change-Id: I373d35f7ccc383b8421bd14044457467d80425f3
2014-03-12 15:09:42 -07:00
Jose Lima
9d50ea90f7 am c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit 'c770e064effb79c33472f54652bd95aa14a8d6ec':
  Added LEANBACK_LAUNCHER Intent category
2014-03-12 15:19:37 +00:00
Neil Fuller
ad895779f8 Merge "Add APIs for better interoperability with Java 1.7" 2014-03-12 11:46:11 +00:00
Jose Lima
dd0db799ee am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit '5f0c0498a1382ef955cccca95920ec878fe2a64c':
  Added LEANBACK_LAUNCHER Intent category
2014-03-11 19:19:11 +00:00
Winson Chung
303e1ff1fe Initial changes for recents.
Change-Id: Ide2c202b4a5b25410f0f32bd0a81ccf817ede38f
2014-03-11 12:03:08 -07:00
Jessica Hummel
f72078bdc5 Move the provisioning intents to DevicePolicyManager.
Change-Id: Ibde867b193e64c1fda8d9c84b0d1be36a1592035
2014-03-11 18:05:29 +00:00
Jose Lima
38b75b6126 Added LEANBACK_LAUNCHER Intent category
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
2014-03-11 10:43:31 -07:00
Alan Viverette
ba346f9d8d Unify touch feedback drawable and reveal drawable
BUG: 13030730
Change-Id: I65a50a00bd76b80bb242b1573b89e443e2e143fe
2014-03-10 19:09:28 -07:00
Robert Shih
f0768d71bd Merge "MediaMuxer: added WebM filetype; open output file RW." 2014-03-10 19:02:34 +00:00
Paul Lawrence
2bc6857532 Merge "Clean up a few minor issues" 2014-03-10 16:41:22 +00:00
Jessica Hummel
409a688fc6 Fix build
Change-Id: Ie0741d34044f4b1ba92de8d9d91502f37b223507
2014-03-10 10:57:01 +00:00
Jessica Hummel
df897d08ce Merge "Extend DeviceAdminReceiver to receive provisioning complete broadcast." 2014-03-10 09:29:25 +00:00
Jeff Brown
2901e0442a am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '9e3de5f70d77f7152b25fec6c27b73d037c1376d':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-08 05:43:12 +00:00
Jeff Brown
6f9f8e7aad am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '01b5e765e59c14cdfb62f1a8684e9116a46874d2':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-07 23:39:12 +00:00
Jeff Brown
6212a49a94 Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.

Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.

Bug: 12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
2014-03-07 14:02:55 -08:00
Chris Craik
b3a8b2c823 Hide isolatedZVolume API
Change-Id: Ia3a70aaac3d7027285a7510d6fed9ca3548a0bf1
2014-03-07 13:10:30 -08:00
Neil Fuller
38ce4c0f83 Add APIs for better interoperability with Java 1.7
Must be committed at the same time as the change in libcore
to update the public API footprint.

See commit 803b527995177a798499552ab1d15dbdac2ab976 in libcore.

Change-Id: Ic3af8dc762a20640ea9b7f08c6339fc36982224c
2014-03-07 15:25:29 +00:00
Chris Craik
b7d0cfa0d8 Merge "Add Path.isConvex, and force View outlines to be convex" 2014-03-06 18:18:59 +00:00
Jessica Hummel
8cdb6fcd9b Extend DeviceAdminReceiver to receive provisioning complete broadcast.
The managed profile provisioning app completes provisioning (creating the profile, installing the mdm on the secondary user, setting the mdm as the profile owner, removing unneeded apps from secondary user, removing mdm from the primary user). Then it sends a notification that the provisioning has completed across to the new profile. If the mdm, which is now installed on the profile wants to be notified that provisioning has completed it needs to implement this callback method.

Change-Id: I75f2d6d19709fd39aa867f1254e0c37a0c936222
2014-03-06 17:23:03 +00:00
Griff Hazen
5ab311550f am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev
* commit '6daf22ca7680261e07dfd298a43d6e473e6c06f6':
  Add addExtras and getExtras to Notification.Builder.
2014-03-06 02:57:21 +00:00
Griff Hazen
47826bfa16 am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev
* commit 'c748341af5616e183303dbe3267627a7f08aea37':
  Add addExtras and getExtras to Notification.Builder.
2014-03-06 02:19:38 +00:00
Griff Hazen
720042b72f Add addExtras and getExtras to Notification.Builder.
addExtras allows merging with exiting set extras instead of replacing
them. This matches the similar function putExtras in Intent.

Both functions are useful for multi-stage notification building logic.

Change-Id: Ice3e4a53ec05b7129ebdac14e2084163946273a4
2014-03-05 18:00:57 -08:00
Alan Viverette
4b131046aa Revert "Revert "Fix the build.""
WE MUST GO DEEPER

This reverts commit 9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44.

Change-Id: Ia89f764648e15a60ce488d8a2b4bce97bdb37b20
2014-03-05 02:09:32 +00:00
Alan Viverette
9e0c0a6e97 Revert "Fix the build."
This reverts commit 737629a346e953f5506672834e466acbb06caf39.

Change-Id: If3775b57f343094d343991e964faa202748d0236
2014-03-05 02:08:29 +00:00
Alan Viverette
737629a346 Fix the build.
Change-Id: If6c301de541750ef76572879facc2c1f8f2c5855
2014-03-04 17:43:25 -08:00
Will Haldean Brown
568628dc2c Manually merge commit '2faf28cf' into master
Original commit message:

  Add swipe-to-dismiss support to PhoneWindow.

  This adds a new window feature -- FEATURE_SWIPE_TO_DISMISS -- and a
  theme attribute to activate that feature. When the feature is
  activated, a SwipeDismissLayout is inflated as the DecorView layout.
  SwipeDismissLayout intercepts touch events and steals ones that are
  large swipes to the right if its children don't. PhoneWindow
  registers handlers that listen for these swipe events, translate the
  window when necessary, and finish the activity at the end of the
  gesture.

Conflicts:
	core/java/android/view/Window.java
	core/res/res/values/attrs.xml

Change-Id: I943290b436864ca4a1bd401b88d696e08c921cdd
2014-03-04 15:25:43 -08:00
Will Haldean Brown
11c51608ee am bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev
* commit 'bd79652a9afeee1e81f0f51d11e5869091f58af9':
  Add swipe-to-dismiss support to PhoneWindow.
2014-03-04 21:27:11 +00:00
Zhijun He
add749f664 Camera2: make shading.mode key public
Change-Id: I94f506be19940b1881e65a8de9fe8198194932a3
2014-03-04 21:23:34 +00:00
Will Haldean Brown
ca6234e084 Add swipe-to-dismiss support to PhoneWindow.
This adds a new window feature -- FEATURE_SWIPE_TO_DISMISS -- and a
theme attribute to activate that feature. When the feature is
activated, a SwipeDismissLayout is inflated as the DecorView layout.
SwipeDismissLayout intercepts touch events and steals ones that are
large swipes to the right if its children don't. PhoneWindow registers
handlers that listen for these swipe events, translate the window when
necessary, and finish the activity at the end of the gesture.

Change-Id: I512e758f3c3ffd3b353dba3b911c0e80a88d6f5f
2014-03-04 09:26:15 -08:00
Chris Craik
5be83edd15 Add Path.isConvex, and force View outlines to be convex
Change-Id: Idf3f1ee44240d77f7a7ddd0da898da8aa5d41864
2014-03-03 16:16:19 -08:00
Tom O'Neill
248ada68cc Injected settings no longer include summaries
- Bug: 13279850

Change-Id: I0fd1e60b2a56c45776963c29bbae6f176fdf1bea
2014-03-03 10:30:36 -08:00
Dianne Hackborn
77b987f1a1 Hold a wake lock while dispatching network activity events.
Also add new API for determining whether the current data network
is active, and thus better scheduling network operations.  This
API is designed to not be tied to a mobile network -- regardless
of the network, apps can use it to determine whether they should
initiate activity or wait.  On non-mobile networks, it simply always
reports as the network being active.

This changed involved reworking how the idle timers are done so
that we only register an idle timer with the current default
network.  This way, we can know whether we currently expect to
get callbacks about the network being active, or should just always
report that it is active.  (Ultimately we need to be getting this
radio active data from the radio itself.)

Change-Id: Iaf6cc91a960d7542a70b72f87a7db26d12c4ea8e
2014-02-28 15:19:39 -08:00
Narayan Kamath
ef23865154 Merge "API changes for 64 bit platforms." 2014-02-28 13:21:22 +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
94b5ca811e Merge "Change Activity Scene Transitions to be more automatic redo." 2014-02-27 15:15:06 +00:00
Narayan Kamath
1801b180da API changes for 64 bit platforms.
EGLObjectHandle.<init>(int) and int EGLObjectHandle.getHandle()
have now been deprecated and replaced with variants that take
and return java longs.

bug: 13181704
Change-Id: I67bef5fbf064e85205b8a85e00f91f4ffcf60d19
2014-02-27 14:17:48 +00: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
Felipe Leme
9d1ae3b87c Merge "Added support for WiFi frequency on WifiInfo (getter, settter, and frequency constant). Bug: 12767819" 2014-02-26 19:22:52 +00: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
Amith Yamasani
8fcd324894 Regen current.txt to fix incorrect id for requiredForProfile
Change-Id: I9b3cf326070bffd78e3e30519495b062c81b3d52
2014-02-25 16:54:10 -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
Craig Mautner
24bcc34f78 am 97686e00: am 91df7766: am 42ec5035: Modify API to hide ActivityView.
* commit '97686e00233f6475bd4a5a48bc718fcf88bbf688':
  Modify API to hide ActivityView.
2014-02-25 20:29:33 +00:00
Craig Mautner
91df776654 am 42ec5035: Modify API to hide ActivityView.
* commit '42ec5035672fbfe701ddbf90dcc4390dab9188af':
  Modify API to hide ActivityView.
2014-02-25 20:22:28 +00:00
Craig Mautner
42ec503567 Modify API to hide ActivityView.
Fixes build too.

Change-Id: Ibd571cf36c89691a37c45db59c31237fee17adac
2014-02-25 12:17:15 -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
Martijn Coenen
c197019054 Merge "Add an API to manually invoke Android Beam." 2014-02-25 18:43:37 +00:00
Nicolas Prevot
531270a4a1 Adding the requiredForProfile flag.
Enabling to use requiredForProfile in application manifests
It determines which applications will be installed for managed profiles
and for restricted profiles

Change-Id: I14b4de2c9f41c2bbf5cd9fd0ca6caf5ce2d04131
2014-02-24 18:03:14 +00:00