Commit Graph

48458 Commits

Author SHA1 Message Date
Clara Bayarri
ae4a3c1887 am de5cdeba: Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev
* commit 'de5cdebac7b50871c3ece6ccd0b2a4d7a4b384bc':
  Fix Toolbar is not refreshed after Select All
2015-06-05 02:17:49 +00:00
Clara Bayarri
01243ac57e Fix Toolbar is not refreshed after Select All
Bug: 21361248
Change-Id: Iab913bd610c208e5881d3d0eb5574efdf9eb5d92
2015-06-05 03:03:31 +01:00
Zhijun He
621c88b9bf am 0ccc940a: Merge "Camera2: implement high speed video APIs" into mnc-dev
* commit '0ccc940a0db0f6a779ed2cbc0f24a395046536e0':
  Camera2: implement high speed video APIs
2015-06-05 01:21:17 +00:00
Zhijun He
0ccc940a0d Merge "Camera2: implement high speed video APIs" into mnc-dev 2015-06-05 01:07:52 +00:00
Doris Liu
961bf18e6f am 5de55868: Merge "Make ListView\'s EdgeEffect respect the clipToPadding flag" into mnc-dev
* commit '5de55868a9795a487af80e48540be84b6bdc7b97':
  Make ListView's EdgeEffect respect the clipToPadding flag
2015-06-05 01:05:53 +00:00
Doris Liu
5de55868a9 Merge "Make ListView's EdgeEffect respect the clipToPadding flag" into mnc-dev 2015-06-05 00:57:32 +00:00
Doris Liu
f36c061909 Make ListView's EdgeEffect respect the clipToPadding flag
This CL sets the position of EdgeEffect based on whether
clipToPadding is enabled. When enabled, the EdgeEffect will be
bounded to the padding. Otherwise, it will be drawn at the view's
bounds.

Bug: 21595866
Change-Id: I3968e5b8d3a75ce2d7607e2037bc372024694d5b
2015-06-04 17:50:47 -07:00
Clara Bayarri
d3f321e68d am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev
* commit 'c1f28bc97d2f88f839269ce701c7fe68c4f1615a':
  Separate the SelectionActionMode into Insertion and Selection.
2015-06-05 00:49:02 +00:00
Clara Bayarri
c1f28bc97d Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 2015-06-05 00:40:43 +00:00
Wale Ogunwale
1fcc6b42b9 am 733f1474: Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev
* commit '733f147401f180b14acb13137cf99e65da1d72cc':
  Always have a handler for PendingIntents sent in the system process
2015-06-05 00:36:59 +00:00
Wale Ogunwale
733f147401 Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 2015-06-05 00:23:28 +00:00
Johnson Hsieh
f6331ad249 am 6c72febd: Merge "Updates AlarmClock intent API." into mnc-dev
* commit '6c72febd3526cc460b62926302fbcde1d38d42e5':
  Updates AlarmClock intent API.
2015-06-04 23:48:49 +00:00
Johnson Hsieh
6c72febd35 Merge "Updates AlarmClock intent API." into mnc-dev 2015-06-04 23:34:50 +00:00
Yohei Yukawa
aa8c587d9e am 4493017a: Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev
* commit '4493017abb5ff30648b7d736b411c4d22d002de1':
  Report EditorInfo#packageName based on the actual uid.
2015-06-04 23:23:00 +00:00
Yohei Yukawa
4493017abb Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev 2015-06-04 23:12:45 +00:00
Zhijun He
a767772230 Camera2: implement high speed video APIs
Bug: 21442271
Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
2015-06-04 15:22:00 -07:00
Tim Kilbourn
1381fcc44d am 57914802: Merge "DO NOT MERGE Fix DropBoxManager.Entry parcels with fds." into mnc-dev
* commit '57914802b5c514a84e69b52c8897eaa3a3e74aa7':
  DO NOT MERGE Fix DropBoxManager.Entry parcels with fds.
2015-06-04 21:50:53 +00:00
Tim Kilbourn
4bf27b53b9 DO NOT MERGE Fix DropBoxManager.Entry parcels with fds.
When the socketpair communication channel was added to
ParcelFileDescriptor, the CREATOR method for DropBoxManager.Entry was
not updated to read the extra fd from the Parcel. This was causing reads
to end too early.

Also removed comments referring to the now-deleted native methods in
the native Parcel implementation.

Change-Id: I49a9691da6ea927382ceb2fcbfdc7985a601111b
(cherry picked from commit ba953230f7)
2015-06-04 21:37:50 +00:00
Jeff Brown
dd6d30f294 am 16422b25: Merge changes If241e329,Ib69b6987 into mnc-dev
* commit '16422b25f7a814be0c3ceba44a4e9e62b10427a5':
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.
2015-06-04 21:20:32 +00:00
Jeff Brown
16422b25f7 Merge changes If241e329,Ib69b6987 into mnc-dev
* changes:
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.
2015-06-04 21:11:05 +00:00
Eino-Ville Talvala
0ec5a04bbe am 05ae9b56: Merge "Camera: Change origin of poseTranslation." into mnc-dev
* commit '05ae9b56aec7c1a261eb84741b43e40351d20bd4':
  Camera: Change origin of poseTranslation.
2015-06-04 20:59:42 +00:00
Ruben Brunk
008175be31 am 74fc1837: Merge "Fix CameraManager#open exception handling." into mnc-dev
* commit '74fc1837e014e6bfbc2c5d47eefa6bed6698394b':
  Fix CameraManager#open exception handling.
2015-06-04 20:59:30 +00:00
Eino-Ville Talvala
05ae9b56ae Merge "Camera: Change origin of poseTranslation." into mnc-dev 2015-06-04 20:52:02 +00:00
Ruben Brunk
74fc1837e0 Merge "Fix CameraManager#open exception handling." into mnc-dev 2015-06-04 20:43:16 +00:00
Eino-Ville Talvala
d3dbfb3f75 Camera: Change origin of poseTranslation.
No actual defined center for the Android sensor coordinate system
exists, so define the translation relative to the largest camera
device facing the same way.

Bug: 20123879
Change-Id: Ica33d23717c976c063c26b768af5b6148483909c
2015-06-04 13:41:56 -07:00
Eino-Ville Talvala
1caa54f50f am ea7547f1: Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev
* commit 'ea7547f155e230f30c489db3626dce1c69a9004e':
  CameraManager: Ensure all public methods connect to camera service.
2015-06-04 20:26:35 +00:00
Eino-Ville Talvala
ea7547f155 Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev 2015-06-04 20:13:41 +00:00
Adam Powell
f3aec75fd6 am 1da56b51: Merge "Make WindowInsets#hasInsets check for stable insets as well" into mnc-dev
* commit '1da56b51d59aa4c587dcdb5bf4c1719961be0ae7':
  Make WindowInsets#hasInsets check for stable insets as well
2015-06-04 20:04:52 +00:00
Chad Brubaker
f829ae4955 am 43e77bf6: Merge "Add optional additional entropy to finish" into mnc-dev
* commit '43e77bf6209bd964bd9cc568b5f37b26401956b3':
  Add optional additional entropy to finish
2015-06-04 20:04:47 +00:00
Eino-Ville Talvala
2ef01737af CameraManager: Ensure all public methods connect to camera service.
Otherwise, registerAvailabilityCallback won't actually cause caller to
receive callbacks, if no other methods on CameraManager are ever
invoked.

Bug: 21536556
Change-Id: I5cded8a59846a971d6272ac3bced44678a533165
2015-06-04 12:58:01 -07:00
Adam Powell
1da56b51d5 Merge "Make WindowInsets#hasInsets check for stable insets as well" into mnc-dev 2015-06-04 19:49:36 +00:00
Chad Brubaker
43e77bf620 Merge "Add optional additional entropy to finish" into mnc-dev 2015-06-04 19:48:29 +00:00
Clara Bayarri
7938cdbf98 Separate the SelectionActionMode into Insertion and Selection.
When we got rid of the paste popup, we merged it into the Selection
ActionMode and moved all its invocations to the ActionMode. Some apps
actually want the paste popup without the Selection ActionMode, hence
separating them again allows them to cancel the one they want.

Bug: 21571422
Change-Id: I91bcd0d9c3e68d9c736698fe0bec010b4c9f5cf3
2015-06-04 20:46:19 +01:00
Adam Powell
56e3e8bab5 am 2b710c29: Merge "Add DENSITY_360" into mnc-dev
* commit '2b710c29e2ae7808bbd1a1a6d0c39f69ad8bf33a':
  Add DENSITY_360
2015-06-04 19:46:07 +00:00
Adam Powell
05e967820d Make WindowInsets#hasInsets check for stable insets as well
Bug 20091509

Change-Id: Ia7dda5ab94a0904277c1078f3f73a59a735860d8
2015-06-04 12:38:13 -07:00
Ruben Brunk
a45aa0d549 Fix CameraManager#open exception handling.
Bug: 21620938
Change-Id: I062989c5fed6f99c0566da2f56bfb6b657734a33
2015-06-04 12:26:10 -07:00
George Mount
0c92974e7b am e50b091d: Merge "Clean up the enter transition even if there is not entering fragment." into mnc-dev
* commit 'e50b091df9586c5c41d219ffb0c41fa3f893c329':
  Clean up the enter transition even if there is not entering fragment.
2015-06-04 18:33:48 +00:00
Alan Viverette
cab45a2e4a am 2e4e5d74: Merge "Revert "Synchronize selected item data on-demand after data set invalidation"" into mnc-dev
* commit '2e4e5d745f6e2bc2d9d63b25a45385b55ec4cfe3':
  Revert "Synchronize selected item data on-demand after data set invalidation"
2015-06-04 18:33:32 +00:00
Dianne Hackborn
ab23ee722f am b0a5e78f: Merge "More API changes." into mnc-dev
* commit 'b0a5e78fc06aeb67ac1f55832c9ceef5f92a0807':
  More API changes.
2015-06-04 18:33:12 +00:00
Alan Viverette
a350e4f139 am 52999685: Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into mnc-dev
* commit '52999685178656caba37fa0e9055ac26d707bdce':
  Prevent poorly-extended ParcelableSpans from writing to parcels
2015-06-04 18:33:06 +00:00
Johnson Hsieh
1ef714a284 Updates AlarmClock intent API.
Changes to the AlarmClock intent API based on feedback from Alarm team:

1. s/VOICE_CANCEL_ALARM/DISMISS_ALARM/g - "Cancel" is a bit unclear, so we're
changing it to "dismiss". Also, remove "VOICE_" since we should also add
support for this in multi-modal.

2. Removed DELETE_ALARM - we will likely not complete this for Android M.

3. Removed ALARM_SEARCH_MODE_NONE = "none". Instead, if
EXTRA_ALARM_SEARCH_MODE is missing (and alarm data URI is not given), then:
* If exactly one active alarm exists, it is dismissed.
* If more than one active alarm exists, the user is prompted to choose
  the alarm to dismiss.

4. Add ALARM_SEARCH_MODE_LABEL, which allows searching for alarms by a
(partially) matching label.

5. Add SNOOZE_ALARM for snoozing an alarm, with optional
extra EXTRA_ALARM_SNOOZE_DURATION.

Change-Id: I39502532e54d5f0fe51a8545a4c586615f5e5e89
2015-06-04 10:43:19 -07:00
Adam Powell
f6d9cd19e2 Add DENSITY_360
Add 360dpi as a supported screen density to closer match some
hardware's physical specifications. This gives a dp multiplier of
2.25.

Bug 19529059

Change-Id: Ibf9c768fba53765ea684ff228d24caf091f27a3e
2015-06-04 10:41:44 -07:00
George Mount
e50b091df9 Merge "Clean up the enter transition even if there is not entering fragment." into mnc-dev 2015-06-04 17:32:53 +00:00
George Mount
ec3364cc32 Clean up the enter transition even if there is not entering fragment.
Bug 21618103

Change-Id: Id670465afd0b743f964d24d7d36d49706b459ac8
2015-06-04 10:28:54 -07:00
Alan Viverette
2e4e5d745f Merge "Revert "Synchronize selected item data on-demand after data set invalidation"" into mnc-dev 2015-06-04 17:19:27 +00:00
Alan Viverette
31ff78b146 Revert "Synchronize selected item data on-demand after data set invalidation"
This CL was a can of worms. More extensive changes are
needed to decouple AdapterView state from measure/layout
passes.

This reverts commit abed07f6c0.

Change-Id: I4e4e01692a1f660a04e9dfd16db882f13c3d0b94
2015-06-04 17:18:34 +00:00
Chad Brubaker
8a07701f38 Add optional additional entropy to finish
If provided the extra entropy will be added to the device before calling
finish. If entropy is provided and the device does not support supplying
additional entropy then finish will fail with KM_ERROR_UNIMPLEMENTED.

(cherry-picked from commit 9ce30624a4)

Change-Id: If26be118bf382604f6f8e96e833b76e6f9e94d58
2015-06-04 10:06:00 -07:00
Dianne Hackborn
b0a5e78fc0 Merge "More API changes." into mnc-dev 2015-06-04 16:56:52 +00:00
Alan Viverette
5299968517 Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into mnc-dev 2015-06-04 16:55:57 +00:00
Wale Ogunwale
9a6ef1e94c Always have a handler for PendingIntents sent in the system process
It is possible for deadlocks to occur when sending/processing
PendingIntents due to components like AMS holding global service
locks when dispatching the broadcast without specifying an
handler and the receiver calling back into AMS.

We now set a default handler to process the broadcast on if we
are in the system process and a handler wasn't specified.

Bug: 19502993
Change-Id: Iccde32c6c1df997784155bc41ef39e52ee0f7243
2015-06-04 07:58:24 -07:00