Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
166,140 Commits 3 Branches 0 Tags
eaaa38aea09e82fc557ebf0dd7fd02acfbfa1d59
Commit Graph

4749 Commits

Author SHA1 Message Date
Sander Alewijnse
a1ceb92964 am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 
* commit '94efda638e9789cacfbdffae6c6d6fae1dd41667':
  Change javadoc of setAccountManagementDisabled.
 2014-10-31 10:20:08 +00:00
Sander Alewijnse
a0edff4e94 Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 2014-10-31 10:05:36 +00:00
George Mount
104257bac6 am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 
* commit 'cfff54270b7b09e66eb618b51706c3f8779fb110':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
 2014-10-31 00:38:48 +00:00
Jeff Hao
05ea3213fd am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-30 23:44:09 +00:00
George Mount
ca5094a05c Fix NPE when snapshot ImageView uses ScaleType.MATRIX. 
Bug 18170774

Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
 2014-10-30 12:21:00 -07:00
Sander Alewijnse
112e053b9a Change javadoc of setAccountManagementDisabled. 
Method can also be called by device owner.

Bug:18166033
Change-Id: I38ab17bdfe9f0c4b33f5257d2f335afe16e84031
 2014-10-30 14:54:28 +00:00
Jeff Hao
9f60c08a44 Change boot screen title to "Android is starting" when not upgrading. 
Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
 2014-10-29 14:42:39 -07:00
George Mount
aeb0a9dba2 am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 
automerge: 8a536bb

* commit '8a536bb4e04b8a0e4f074c744321d352d5bf08b2':
  Fix NPE in moveSharedElementsToOverlay
 2014-10-28 18:06:58 +00:00
George Mount
c142397272 am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 
automerge: 69a3dd8

* commit '69a3dd85df49d5c5ef67d7c28f1473d23ce46980':
  Fixed: Nested shared elements now transition separately.
 2014-10-28 18:06:04 +00:00
George Mount
95d520f160 Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 2014-10-28 17:01:25 +00:00
George Mount
45b701085b Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 2014-10-28 17:00:43 +00:00
Dake Gu
54aad95336 am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev 
automerge: 63964d9

* commit '63964d9eae11b79e3d50ee5f3cc79b08050653fe':
  ActivityTransition: Encode scaleType and matrix in snapshot view
 2014-10-27 21:34:58 +00:00
George Mount
eca1ae5e44 Fix NPE in moveSharedElementsToOverlay 
Bug 18119532

Change-Id: I334bda2d63427032583a15a483e000412024c150
 2014-10-27 14:25:12 -07:00
Dake Gu
4c2e3491ec Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev 2014-10-27 20:23:28 +00:00
George Mount
333b8093ea Fixed: Nested shared elements now transition separately. 
Bug 18073470

Shared element ordering was based on the key ordering in an
ArrayMap. This is normally fine, but when shared elements
are nested, the child's layout can be overwritten by the
parent's if it is laid out first. The only way to force the
ordering of shared element layout was the change the transition
name. To fix this, shared elements are now laid out parent
first, then child.

On return, nested shared elements were not transitioning to their
final destination properly because the matrix used to calculate
their position was not correct. This change recalculates the
parent matrices when appropriate.

Change-Id: I62333183cf03519e525587e4ea31fcf14bb83cdc
 2014-10-24 16:19:19 -07:00
George Mount
a618afc0c7 am 511452cf: am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev 
* commit '511452cf4d3cd2669a89abd98658a844b852b5e3':
  Fix NPE when rejected snapshots are null.
 2014-10-24 23:13:38 +00:00
George Mount
b71580c34e Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev 2014-10-24 22:43:45 +00:00
George Mount
83c692efd3 Fix NPE when rejected snapshots are null. 
Bug 18055705

Change-Id: Id0b98e7da5510af438c5d66c0ddb00489d581864
 2014-10-24 15:26:32 -07:00
Jeff Sharkey
b144b5f125 am e92bd4c0: am 2d87ba63: Merge "Allow I/O when installing providers." into lmp-mr1-dev 
* commit 'e92bd4c04bcb0d18c0fdae9246f4af06a5aba345':
  Allow I/O when installing providers.
 2014-10-24 17:48:22 +00:00
Jeff Sharkey
2d87ba630c Merge "Allow I/O when installing providers." into lmp-mr1-dev 2014-10-24 17:40:30 +00:00
Adrian Roos
621823e064 am 53f30ec2: am bcd07652: Add API for querying trusted state 
* commit '53f30ec270db8c6b92ff06579cf4c591efe2544b':
  Add API for querying trusted state
 2014-10-24 13:27:39 +00:00
Adrian Roos
bcd076525c Add API for querying trusted state 
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
 2014-10-24 13:59:45 +02:00
Svetoslav
eed63916a1 am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev 
automerge: 89e7ffe

* commit '89e7ffedadd20a3091e72b42f86c500452df193c':
  APIs for an accessibility service to put interaction tracking overlays.
 2014-10-24 02:04:11 +00:00
Jeff Sharkey
bb2e2cae58 Allow I/O when installing providers. 
Bug: 17879170
Change-Id: I073d5b56bab6db01290aad5386c53c305669dc5b
 2014-10-23 11:42:31 -07:00
Svetoslav
3a5c721072 APIs for an accessibility service to put interaction tracking overlays. 
An accessibility service may register to observe the interactive windows
on the primary display. These windows are the one that has input focus and
ones a sighted user can touch. It is sometimes beneficial for an
accessibility service to overlay a window to intercept user interaction
and based on that introspect and perform an action on the windows that
are on the screen. This is problematic as overlaying a full screen window
that is touchable prevents the accessibility service to introspect the
content under this window.

This change adds a special type of window that only an accessibility service
can place which does not affect what an accessibility service can "see" on
the screen. Hence, even putting such a window full screen the service will
be able to interact with the other interactive windows it covers.

Change-Id: I053ccc3a5c6360a98dc40bdb172b54dab35d8b31
 2014-10-21 14:45:53 -07:00
Brian Carlstrom
70111a429d am fe6cde37: am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit 'fe6cde379a7b086032877917c0ee0e64bf7e9e57':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 18:05:13 +00:00
Brian Carlstrom
6580c273a5 am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit 'd2b824887f9ec2e3448bd38aae58efbc4f178997':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 17:45:54 +00:00
George Mount
56789daadf am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 
* commit '27a08f2ad547934280b626aee9c60dd3a597e6da':
  Use empty snapshots list when there are no shared elements.
 2014-10-16 14:29:51 +00:00
George Mount
ea6f0ae86d Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 2014-10-16 14:21:43 +00:00
Brian Carlstrom
20de619d66 Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 2014-10-16 01:01:26 +00:00
George Mount
7c479f5a01 Use empty snapshots list when there are no shared elements. 
Bug 17964119

Change-Id: Ia2a63e52623d1e4238b0fd4e25d565451e856834
 2014-10-15 16:21:51 -07:00
Amith Yamasani
2df0ce5e2b am ecb7b899: am 5c8cafa6: am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev 
* commit 'ecb7b899b022d2ecbee48324c1e4a524a596a29e':
  Fix admin policies in managed profiles
 2014-10-15 18:12:10 +00:00
Amith Yamasani
5c8cafa614 am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev 
* commit '01ddc75fc1e9ea28212512299132e9bdace60e05':
  Fix admin policies in managed profiles
 2014-10-15 17:54:34 +00:00
Amith Yamasani
2c3886cb34 Merge "Fix admin policies in managed profiles" into lmp-dev 2014-10-15 17:44:24 +00:00
Amith Yamasani
242f4b1259 Fix admin policies in managed profiles 
Some of the admin policies are throwing security exceptions in
a managed profile without being documented correctly and others
shouldn't be throwing security exceptions.

Changed setCameraDisabled() to not throw an exception. It now just
prevents work profile apps from using the camera.

Changed wipeData() to allow passing in ERASE_EXTERNAL_STORAGE. In
secondary users/profiles, this is just going to remove the user, so
the flag is harmless.

Updated documentation for setKeyguardDisabledFeatures() and resetPassword()
to indicate that they cannot be called in a managed profile.

Bug: 17987913
Change-Id: I8060be4c2d32bdd4edb46ce543551fabb9c8c983
 2014-10-15 10:42:17 -07:00
Narayan Kamath
8091edbffb Set threads' contextClassLoader during LoadedApk.makeApplication. 
We used to set this from LoadedApk.getClassLoader. This had
the unfortunate side effect of clobbering the threads default
classloader when Context.createPackageContext().getClassLoader()
was called. This happens, for example, to every app that uses
a updatable webview.

bug: 17986934
Change-Id: If2b5938a19f836ea5fe60c94ea53a7125c2098c0
 2014-10-15 11:38:44 +01:00
Jeff Sharkey
6449ba6d8c am 92ab2748: am 4d526bd2: am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit '92ab2748efc185a347d11e1382d54b86ffd22799':
  Start cross profile intents as caller.
 2014-10-15 03:21:58 +00:00
Jeff Sharkey
4d526bd249 am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit 'cf2c564987965be1241fe197106b3ec22b11b4b0':
  Start cross profile intents as caller.
 2014-10-15 02:19:26 +00:00
Dianne Hackborn
133c747e10 am 3c5a70e0: am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit '3c5a70e0314cd21d42eda406ed2239303b07e6e1':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-15 02:03:59 +00:00
Jeff Sharkey
9797880808 Start cross profile intents as caller. 
The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.

Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
 2014-10-14 17:57:28 -07:00
Dianne Hackborn
f23b29ad5a am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit 'a861a9d713c99b576c0e7284a65d50838c4f953a':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-14 19:58:39 +00:00
Dianne Hackborn
f85e7af4d0 Fix issue #10034864: Define YouTube application as the preferred... 
...handler for its Intents

Fix bug when a third party app is installed as an additional but
worse match for the intent.

Also raise up the limit for when we start printing logs about
overly large strict mode data.

And turn off the logs about services being created and destroyed,
since with the way things are using services these days these have
become way too spammy.

Change-Id: I8fe301dfd80fb4b70213cb7783b7c5426245278d
 2014-10-14 10:46:52 -07:00
Christopher Tate
697c94a4ab am 702f2747: am f1178b23: am 2c15bbc8: am 1133e29f: Tweak wallpaper restore rejection threshold 
* commit '702f2747b5731371558f8e4bb448582023831fda':
  Tweak wallpaper restore rejection threshold
 2014-10-10 23:20:52 +00:00
Christopher Tate
f1178b23ac am 2c15bbc8: am 1133e29f: Tweak wallpaper restore rejection threshold 
* commit '2c15bbc8382ac7e5f04d149c8f576261f1dca334':
  Tweak wallpaper restore rejection threshold
 2014-10-10 22:52:57 +00:00
Dianne Hackborn
5457d5ccb6 am 8f6928f1: am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit '8f6928f1399620ce432b82d046912e2030d6511c':
  Improve some docs, fix some debugging.
 2014-10-10 21:06:48 +00:00
Dianne Hackborn
e61e68d001 am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit '18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63':
  Improve some docs, fix some debugging.
 2014-10-10 20:47:07 +00:00
Christopher Tate
1133e29f22 Tweak wallpaper restore rejection threshold 
Raise the height ratio threshold slightly in order to start accepting
restores of height=1920 images onto height=2560 devices.

Bug 17882661

Change-Id: I63b47817fdf754cda9a052bddb62aee764522c6f
 2014-10-10 17:54:14 +00:00
Dianne Hackborn
a22d2fc319 am 57af6ac7: am d190a5ca: am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '57af6ac767ff7063adbff694ff784e9ddc442a7e':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 17:14:36 +00:00
Jorim Jaggi
1137ea7eaf am 782994ef: am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 
* commit '782994efd30a153af44c38a9871d24fecb0eb609':
  Apply color to progress bar for notifications
 2014-10-10 17:01:07 +00:00
Tim Kilbourn
9d285e7f99 am 79297f3c: am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '79297f3c1c7898a194310169ef499889ed544a57':
  Don't start SearchDialog on television.
 2014-10-10 16:59:04 +00:00