Commit Graph

48291 Commits

Author SHA1 Message Date
Clara Bayarri
c1f28bc97d Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 2015-06-05 00:40:43 +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
6c72febd35 Merge "Updates AlarmClock intent API." into mnc-dev 2015-06-04 23:34:50 +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
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
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
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
ea7547f155 Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev 2015-06-04 20:13:41 +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
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
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
Keisuke Kuroyanagi
4186b1d4d8 Merge "Stop offering "Replace..." when there are no suggestions." into mnc-dev 2015-06-04 06:06:52 +00:00
Svetoslav Ganov
b387647439 Merge "Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe." into mnc-dev 2015-06-04 02:21:09 +00:00
Nirmal Patel
386a824384 Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe.
b/21087793

Change-Id: Ice690e3d7494788fb9e1e234a54f14831bd4e0d3
(cherry picked from commit ebd8eb4610d6bb9322a374f8965a78ba1c39ee63)
2015-06-03 19:18:00 -07:00
Zhijun He
b1300e39c7 Camera2: add high speed video APIs
Interface only.

Bug: 21442271
Change-Id: If81caa0f2dc9f7802af564abcd9541aff3e30901
2015-06-03 17:50:22 -07:00
Zhijun He
fab663ebfd camera_metadata: update high speed video recording API
Update high speed video recording API to support batch mode recording.

Bug: 21442271
Change-Id: I62de6067c75fcfbe6320dd987cce65843d810021
2015-06-03 17:45:48 -07:00
Alan Viverette
8d6a9363a1 Merge "Fix drop down layout inflation in ThemedSpinnerAdapter classes" into mnc-dev 2015-06-03 23:48:41 +00:00
Adrian Roos
461829d607 Prevent windows below the keyguard from showing
Fixes a bug where windows below the lock screen
could become visible if a SHOW_WHEN_LOCKED activity
hides the status bar.

Bug: 21450145
Change-Id: Ie660394cb96d7e6839bd4fb7c2729133bac2dfc5
2015-06-03 23:44:52 +00:00
Alan Viverette
d3c9df1a34 Merge "Update number picker styling for Material" into mnc-dev 2015-06-03 23:35:02 +00:00
Alan Viverette
e9bb596cc8 Merge "Synchronize selected item data on-demand after data set invalidation" into mnc-dev 2015-06-03 23:29:10 +00:00
Alan Viverette
7d5967e55e Fix drop down layout inflation in ThemedSpinnerAdapter classes
Bug: 21209640
Change-Id: I32aed1b70977fae25f43714eb3ef6edca53e51e9
2015-06-03 16:27:36 -07:00
Alan Viverette
b8da5340f2 Merge "Pass setEnabled() value in calendar-mode DatePicker delegate" into mnc-dev 2015-06-03 23:20:36 +00:00
Raph Levien
88ac4e04a5 Merge "Rename setTextDir to setTextDirection" into mnc-dev 2015-06-03 23:09:49 +00:00
Yohei Yukawa
02df328f0c Report EditorInfo#packageName based on the actual uid.
This is a follow up CL for Ib871141e3381e45c2623c5f4d692da7a7e78fcc5,
which introduced a verification mechanism between the applicaiton uid
and EditorInfo#packageName reported from the application by using
AppOpsManager#checkPackage.

Regression Bug 21408239 caused by above change is really similar to
the situation we saw in Bug 10688644.  As well explained in the CL
description of Ic04f77b3938585b02fccabbc12d2f0dc62b9ef25, the
system has a special ability to run in the processes of other uids.
Hence we need to use Context#getOpPackageName() instead of
Context#getPackageName() in case components declared by the system
is loaded into another process.

Bug: 18931038
Bug: 21408239
Change-Id: I78510a2ea6ac06cfd5813a23c42f09f70c468493
2015-06-03 15:58:59 -07:00
Adam Powell
cd45913fe3 Merge "Fix view foreground tinting" into mnc-dev 2015-06-03 22:54:00 +00:00
Svetoslav
597059d535 Merge "Adding missing permission API to fragment" into mnc-dev 2015-06-03 22:44:48 +00:00
Svetoslav
a2011d232b Adding missing permission API to fragment
Change-Id: I90309a23a08a82f0ab93eb4f6185db09e035aac1
2015-06-03 15:43:59 -07:00
Clara Bayarri
eb66533716 Merge "Fix Floating tool bar covers text during long press + drag" into mnc-dev 2015-06-03 22:33:59 +00:00
Adam Powell
cec5f733f5 Fix view foreground tinting
Copy and paste is bad, mmkay?

Bug 21209639

Change-Id: I6c17e8a30fad6d5110f18e4723a5f5e6ddb814b8
2015-06-03 15:26:51 -07:00
Alan Viverette
abed07f6c0 Synchronize selected item data on-demand after data set invalidation
Previously, the selected item data could become inconsistent between a
call to Adapter.notifyDataSetChanged()/Invalidated() and the subsequent
layout pass.

Bug: 21614294
Change-Id: I45c9c98b2f6a8d8b8fb17de2065efa505cbf3c92
2015-06-03 15:19:13 -07:00
Mady Mellor
95753e2f4b Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev 2015-06-03 21:15:19 +00:00
Alan Viverette
f7aa9251d0 Pass setEnabled() value in calendar-mode DatePicker delegate
Fixes mContainer referencing wrong view. Also cleans up getCalendarView()
exception message.

Bug: 21211308
Change-Id: I4ad18206a8071b2c9b75d488e14fd53da6f5fa5b
2015-06-03 14:07:26 -07:00
Clara Bayarri
dfac443516 Fix Floating tool bar covers text during long press + drag
The existing implementation started the ActionMode even when knowing
a drag would start. Moved this logic to once the drag is complete,
to avoid the toolbar popping up while the user is still dragging.

Since the existing method selected the initial word when no other
selection existed, refactored that logic so it is also performed at
the start of the drag. Otherwise, the user sees no selection until
he drags over 2 or more words.

Bug: 21144634

Change-Id: I97cf89b1c4c3ebdbbd1af50bd1ce5aa4af72164b
2015-06-03 22:06:55 +01:00
James Cook
8fd48ca377 Merge "Fix TabHost stealing focus on hardware keyboard keypress" into mnc-dev 2015-06-03 20:58:52 +00:00
Raph Levien
a6a082862b Rename setTextDir to setTextDirection
StaticLayout.Builder used "setTextDir" as a shorthand, but it's not
as clear as spelling it out. So, setTextDirection.

Bug: 21572282
Change-Id: Ia94476562d70678f963196b87bb63511d30836b6
2015-06-03 13:20:45 -07:00