Commit Graph

51242 Commits

Author SHA1 Message Date
Etan Cohen
b271d27dbc Merge commit 'db1dbb8' into merge2 2015-04-24 14:06:00 -07:00
Etan Cohen
a179962b61 Merge commit '25a217c' into merge2
Change-Id: I116a9dbf19e95651a7c50393e4dcd7fb59ca3f3f
2015-04-24 13:58:45 -07:00
Etan Cohen
5c0d6f61ab Merge commit '6ddbb5e' into merge2 2015-04-24 13:44:05 -07:00
Etan Cohen
fa96c94c30 Merge commit '9561e74' into merge2 2015-04-24 13:43:36 -07:00
Tor Norbye
1fd75d83c3 Merge "Add permission requirement annotation for KeyGuard" 2015-04-24 18:54:26 +00:00
Alan Viverette
6e37e5a006 Merge "Implement RTL support in framework ViewPager, DatePicker" 2015-04-24 18:06:50 +00:00
Mark Renouf
e2725f87b4 am f237bce8: am 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit 'f237bce8c3bb4ac31a4c5eaa732de95d5b469f34':
  Fixes rejected dismiss gestures (framework version of ag/677161)
2015-04-24 17:54:33 +00:00
Mark Renouf
f237bce8c3 am 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '99d4930064e7d155ce92746028cbafd46b14c6f4':
  Fixes rejected dismiss gestures (framework version of ag/677161)
2015-04-24 17:42:01 +00:00
Mark Renouf
99d4930064 am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '55555a3dab1f3b99a3299b90851624e9dc10f3cc':
  Fixes rejected dismiss gestures (framework version of ag/677161)
2015-04-24 17:31:31 +00:00
Chien-Yu Chen
e79449aed0 Merge "camera2: validate reprocess request's session" 2015-04-24 17:14:50 +00:00
Tor Norbye
6de5f43986 Merge "Add permission annotations to the Browser" 2015-04-24 17:08:11 +00:00
Mark Renouf
55555a3dab Fixes rejected dismiss gestures (framework version of ag/677161)
Gus's original change description:

This change modifies the logic in SwipeDismissLayout which determines
whether or not a gesture should be interpreted as a dismiss
gesture.

Previously, on the first touch move event, the gesture was classified
as a dismiss gesture if the X movement exceeded the touch slop
and the Y movement did not.  At this point the gesture was not
intercepted and the underlying widget (in the case of the cue
card, the GridViewPager) received all subsequent move events.

In the case of a very fast gesture at a slight vertical angle, it was
easy for the total Y movement to exceed the touch slop.
This change only rejects the gesture if the Y movement exceeds
the X movement, which is consistent with how GridViewPager
distinguishes horizontal vs. vertical swipes.
This change also cancels the dismissal if the end of the gesture
is a leftwards flight.

BUG: 20542762

(Same as b/20350515 but for Activity dismissal at the system level.)

Change-Id: I6e3fb646c42dda0d1c1f5552d91b27c6374fc08c
2015-04-24 11:47:27 -04:00
Nicolas Prevot
7defaef1bf Merge "Restrict setting the profile/device owner with a signature-level permission." 2015-04-24 15:08:02 +00:00
Nicolas Prevot
2806374f95 Restrict setting the profile/device owner with a signature-level permission.
Create the new permission MANAGE_PROFILE_OWNERS to restrict setting
the profile/device owner.

BUG:19838376

Change-Id: Ib55a2db85fcb6f34e3b88c398683bddb0ad66868
2015-04-24 11:36:52 +01:00
Keisuke Kuroyanagi
0591651a62 Quit showing "SELECT ALL" for inappropriate fields.
This blocks showing "SELECT ALL" in FloatingToolBar when
the input is empty or the field is a password field.

Bug: 20407551
Change-Id: Ia25700bbee4f78445776af46eb1369af6600d946
2015-04-24 19:10:50 +09:00
Gustav Sennton
f2953dadbb Merge "Add system API method for loading webview library from another package." 2015-04-24 09:27:19 +00:00
Abodunrinwa Toki
e7d575d860 Merge "TextView: Invalidate ActionMode content rect on scroll." 2015-04-24 06:55:19 +00:00
Jeff Sharkey
620b32b316 Package and storage movement callbacks.
Since package and primary storage movement can take quite awhile,
we want to have SystemUI surface progress and allow the Settings
app to be torn down while the movement proceeds in the background.

Movement requests now return a unique ID that identifies an ongoing
operation, and interested parties can observe ongoing progress and
final status.  Internally, progress and status are overloaded so
the values 0-100 are progress, and any values outside that range
are terminal status.

Add explicit constants for special-cased volume UUIDs, and change
the APIs to accept VolumeInfo to reduce confusion.  Internally the
UUID value "null" means internal storage, and "primary_physical"
means the current primary physical volume.  These values are used
for both package and primary storage movement destinations.

Persist the current primary storage location in MountService
metadata, since it can be moved over time.

Surface disk scanned events with separate volume count so we can
determine when it's partitioned successfully.  Also send broadcast
to support TvSettings launching into adoption flow.

Bug: 19993667
Change-Id: Ic8a4034033c3cb3262023dba4a642efc6795af10
2015-04-23 20:32:17 -07:00
Tor Norbye
52881c8631 Add permission annotations to the Browser
Change-Id: Ib75a846faa4f73468d4c7bc04092ec0e80414d67
2015-04-23 18:49:23 -07:00
Jose Lima
786144599e Merge "Add pre-order as a pricing type for ContentInfoExtender" 2015-04-24 01:23:34 +00:00
Tor Norbye
672055e8d9 Add permission requirement annotation for KeyGuard
Change-Id: Ieb4a8c8d3da7090c6551cbae4db8944fbe462538
2015-04-23 17:30:56 -07:00
Jose Lima
4112056201 Add pre-order as a pricing type for ContentInfoExtender
Change-Id: Ibf9e4f57b47e92789d3e0730c58b0bce14663fec
2015-04-23 16:25:10 -07:00
Ben Kwa
ff0cf1a95e Merge "Move extension checking code into FileUtils." 2015-04-23 23:19:49 +00:00
Ben Kwa
62539a220c Move extension checking code into FileUtils.
Move code for checking file extensions and MIME types from
ExternalStorageProvider into android.os.FileUtils, so it can be used by
other clients (e.g. DownloadsProvider).

BUG=20157955

Change-Id: Ib16a16af723c21fb8d2912c8917dfd68653ea6fa
2015-04-23 16:14:20 -07:00
Prerepa Viswanadham
571bb54c73 Reduce log spam in BluetoothAdapter for getState.
Change-Id: I38995fc55f12b000d58a769ed67aff623865169b
2015-04-23 22:31:29 +00:00
Chien-Yu Chen
7a316f6b1b camera2: validate reprocess request's session
Add a session ID to CaptureResult to indicate the session where
the result comes from. When creating a reprocess capture request
with a capture result, the session ID will be carried over to
the reprocess capture request. Reprocess capture request's session
ID will be used to validate that it matches the session ID when
submitting the reprocess capture request to a session.

Bug: 20263212
Change-Id: I024c1a28ecf0a43909a0ed3814a11360c318417f
2015-04-23 15:21:07 -07:00
Svet Ganov
2fd6dda03e am f33489c6: am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'f33489c6bda49cf930cb06601625ddf792d41fe7':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 22:19:04 +00:00
Adam Powell
a40c2c46b2 Merge "Fixes for ChooserTargetActivity" 2015-04-23 22:15:27 +00:00
Adam Powell
c6d5e3a406 Fixes for ChooserTargetActivity
* Always ensure intent filter is supplied to a ChooserTargetService.
* Add and clarify docs for ChooserTarget constructors.
* Fix a bug where ChooserTargets were being parceled incorrectly.

Change-Id: I32b70c424b0e6bb317e2eeb810566a30c21b9d53
2015-04-23 14:29:30 -07:00
Ed Heyl
a1ab2d37a0 Merge "Quick build fix: Revert "Add pre-order as a pricing type for ContentInfoExtender"" 2015-04-23 20:51:16 +00:00
Ed Heyl
cc5daf1be5 Quick build fix: Revert "Add pre-order as a pricing type for ContentInfoExtender"
This reverts commit 7e0f2ac425.

Change-Id: I52285a668ccfce547a398e1d6b40594dc99745f0
2015-04-23 20:50:44 +00:00
Jose Lima
b3614b7285 Merge "Add pre-order as a pricing type for ContentInfoExtender" 2015-04-23 19:54:59 +00:00
Abodunrinwa Toki
56195db6c4 TextView: Invalidate ActionMode content rect on scroll.
Bug: 20470464
Change-Id: I1a9178903db00d1cef5a835d055939b2ce138290
2015-04-23 19:10:54 +00:00
Tor Norbye
63fc151475 Merge "Add @RequiresPermission" 2015-04-23 18:36:33 +00:00
Abodunrinwa Toki
ab79dee28a Merge "Fix FloatingToolbar.show()" 2015-04-23 18:27:23 +00:00
Craig Mautner
00984f1629 Merge "Disallow data clearing of DeviceOwner." 2015-04-23 18:15:03 +00:00
Svet Ganov
112de0d41b Merge "Return an empty cursor when a content provider app op is disabled" 2015-04-23 18:12:52 +00:00
Craig Mautner
015c5e57b5 Disallow data clearing of DeviceOwner.
There are OEM provided apps that are able to clear the data of the
device owner. That creates a security hole that this fixes.

Fixes bug 20107015.

Change-Id: I4ef313b394bd8059d19d20aa6533396305d1357d
2015-04-23 11:05:02 -07:00
Joe Fernandez
78cb6f5458 am 1009c8de: am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs
* commit '1009c8de23920c4a368edf7f1e2ecde63e40ec82':
  docs: Add text to JavaDocs regarding browser file access vulnerability
2015-04-23 17:57:02 +00:00
Joe Fernandez
1009c8de23 am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs
* commit '92ae292e864287abcb1a78c117263f64b303b885':
  docs: Add text to JavaDocs regarding browser file access vulnerability
2015-04-23 17:45:19 +00:00
Abodunrinwa Toki
0ce3e08a84 Fix FloatingToolbar.show()
*Finer cancel animation methods so we call only the necessary ones.

*Don't set the FloatingToolbarPopup content view's alpha to 0
 before showing it's popup window.

*FloatingToolbarPopup.dismiss() should run when toolbar is hidden.

Bug: 20456876
Change-Id: I2e7ff5f2ec56af2def0976fa8e770c651daaa3a3
2015-04-23 17:33:58 +00:00
Svet Ganov
7271f3e4cb Return an empty cursor when a content provider app op is disabled
bug:17446599

Change-Id: Ic1790c9afbee5eec1dc28e1d53ce82288d4b4f86
2015-04-23 10:26:59 -07:00
Yorke Lee
6446d97942 Merge "Add hidden class in framework for managing the default dialer settings" 2015-04-23 17:23:41 +00:00
Yorke Lee
014de02dd2 Add hidden class in framework for managing the default dialer settings
Bug: 20303635
Change-Id: I7e7318086ade9531fb85f08b8e3f1f001ee0a8d9
2015-04-23 10:19:52 -07:00
Dianne Hackborn
871af48390 Merge "Add "assist block" API." 2015-04-23 16:26:27 +00:00
Svet Ganov
f33489c6bd am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'd24cc19343073294b3376f825bdc0d54a8d692f1':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:43:01 +00:00
Svet Ganov
d24cc19343 am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'db672b6cde256e27c1188c7e99f23e5a65252ba4':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:30:43 +00:00
Svet Ganov
db672b6cde am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit '00e91901fd1dd007de196ada04e3fc2f79e1be73':
  DO NOT MERGE Don't take flags when creating app widget config activity.
2015-04-23 15:18:10 +00:00
Jason Monk
052324c137 Merge "Add constants for usage access settings" 2015-04-23 14:42:17 +00:00
Jason Monk
6f909783e9 Add constants for usage access settings
Bug: 20290386
Change-Id: I216ad25b94de739449941a8b4e965329fe324f66
2015-04-23 10:07:56 -04:00