6429 Commits

Author SHA1 Message Date
Jessica Hummel
4cb211fbd6 am df897d08: Merge "Extend DeviceAdminReceiver to receive provisioning complete broadcast."
* commit 'df897d08cebb013795ae679eef842a38b5153252':
  Extend DeviceAdminReceiver to receive provisioning complete broadcast.
2014-03-10 02:33:44 -07:00
Jessica Hummel
df897d08ce Merge "Extend DeviceAdminReceiver to receive provisioning complete broadcast." 2014-03-10 09:29:25 +00:00
Jeff Brown
3de5a874e5 am 2901e044: am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '2901e0442ab63d3148b708e88f445acaf8d4dc15':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-08 13:02:44 -08: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
Chris Craik
9dea9e69b6 am 2d70802f: Merge "Hide isolatedZVolume API"
* commit '2d70802fec68ccd4b83c6634abcfe2bc4ba428c1':
  Hide isolatedZVolume API
2014-03-07 15:39:04 -08: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
Ben Gilad
45b5cf0f6e Merge "Add the abort API to ICallService implementations." into master-nova 2014-03-06 21:51:23 +00:00
Chris Craik
12eddb01e0 am b7d0cfa0: Merge "Add Path.isConvex, and force View outlines to be convex"
* commit 'b7d0cfa0d8d10ec613bcd6f5072729571d3a9588':
  Add Path.isConvex, and force View outlines to be convex
2014-03-06 12:14:24 -08:00
Griff Hazen
7c70ffe3bf am 5ab31155: am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev
* commit '5ab311550f01412c12c1c68fe75ae929c9d1e9d8':
  Add addExtras and getExtras to Notification.Builder.
2014-03-06 10:29:08 -08: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
Ben Gilad
3fadaa9232 Add the abort API to ICallService implementations.
Change-Id: Ie9b996b4d23184034811ef5667403ff4e47ae2d9
2014-03-05 17:23:41 -08:00
Evan Charlton
74f6bf88eb Add optional data to incoming calls
When a CallService creates an incoming call, allow it to pass a Bundle
of arbitrary data along with the intent. This data will be returned to
the CallService via setIncomingCallId. This makes it easier for
CallServices to match up incoming calls with their IDs.

Change-Id: I52e7e1d0788ecd01aa427e76de7ccf4d9b75f1f0
2014-03-05 14:01:52 -08:00
Evan Charlton
a50f45405d Fix the build
Add CallState.ABORTED

Change-Id: Id7139069f5e3346548785d351df2962457b15299
2014-03-05 09:54:15 -08:00
Alan Viverette
d1ce1ea64f am 4b131046: Revert "Revert "Fix the build.""
* commit '4b131046aa5685112b8f198a989daef13279cadb':
  Revert "Revert "Fix the build.""
2014-03-04 18:11:31 -08:00
Alan Viverette
c8d2668e00 am 9e0c0a6e: Revert "Fix the build."
* commit '9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44':
  Revert "Fix the build."
2014-03-04 18:11:28 -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
829e66d7e8 am 737629a3: Fix the build.
* commit '737629a346e953f5506672834e466acbb06caf39':
  Fix the build.
2014-03-04 17:45:43 -08:00
Alan Viverette
737629a346 Fix the build.
Change-Id: If6c301de541750ef76572879facc2c1f8f2c5855
2014-03-04 17:43:25 -08:00
Will Haldean Brown
8055195f99 am 568628dc: Manually merge commit \'2faf28cf\' into master
* commit '568628dc2cb92b3ec3a87cae9de3203fbdc5968c':
  Add swipe-to-dismiss support to PhoneWindow.
2014-03-04 15:54:13 -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
Zhijun He
65c9bd40da am add749f6: Camera2: make shading.mode key public
* commit 'add749f664660ea2d5acdfae5d66c5dcf511a76e':
  Camera2: make shading.mode key public
2014-03-04 13:27:18 -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
9612dd307c am 5e3e630d: Merge "Injected settings no longer include summaries"
* commit '5e3e630d337dfedaac43f85a42b580ee45749364':
  Injected settings no longer include summaries
2014-03-03 13:07:01 -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
e76f7f7824 am 77b987f1: Hold a wake lock while dispatching network activity events.
* commit '77b987f1a1bb6028a871de01065b94c4cfff0b5c':
  Hold a wake lock while dispatching network activity events.
2014-02-28 17:13:31 -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
c1629efd4c am ef238651: Merge "API changes for 64 bit platforms."
* commit 'ef23865154bf5e6c1768023dd69845353cf8c543':
  API changes for 64 bit platforms.
2014-02-28 05:27:19 -08:00
Narayan Kamath
ef23865154 Merge "API changes for 64 bit platforms." 2014-02-28 13:21:22 +00:00
Mike Lockwood
864082d541 am 17c402d6: Merge "Add support for USB devices with multiple configurations and alternate interfaces"
* commit '17c402d6940a0778f138d2b922f4c4c081f9d09d':
  Add support for USB devices with multiple configurations and alternate interfaces
2014-02-27 10:06:49 -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
George Mount
66fb0fe654 am 94b5ca81: Merge "Change Activity Scene Transitions to be more automatic redo."
* commit '94b5ca811e5716bddb4a4d86df35c29bb9165e5f':
  Change Activity Scene Transitions to be more automatic redo.
2014-02-27 07:20:17 -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
d8362cf259 am 813d85b8: Fix progress bar tinting, add tint support to ShapeDrawable
* commit '813d85b82cb7cbaa5dbe05496d1038caa17a1698':
  Fix progress bar tinting, add tint support to ShapeDrawable
2014-02-26 15:46:22 -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
Felipe Leme
e6269e6c7e am 9d1ae3b8: Merge "Added support for WiFi frequency on WifiInfo (getter, settter, and frequency constant). Bug: 12767819"
* commit '9d1ae3b87cdb77781f21e880c7bcb3ad32f7a906':
  Added support for WiFi frequency on WifiInfo (getter, settter, and frequency constant). Bug: 12767819
2014-02-26 11:25:48 -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
e4f0fe586f resolved conflicts for merge of 8fb4cf1e to master-nova
Change-Id: I61a6fc192b0c2099af9bebdf8e9d8bbfaa4243a3
2014-02-26 10:37:45 -08:00