drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,609 Commits 1 Branch 0 Tags
Commit Graph

212609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczynski
d970f54555 Split WMS.handleAppTransitionReadyLocked. 
Not only some pieces can be split into smaller pieces, but it also
reveals some variables that can be removed or their scope narrowed.

Change-Id: I44c8c9a2535f857c666d5c4a521204e820dbc60b
 2015-08-21 12:43:26 -07:00
Chris Craik
2f967f3e41 Merge "Remove return values from clipping operations" 2015-08-21 16:50:22 +00:00
Rob Carr
4d832d7525 Merge "ActivityManagerService: Rather than throw an exception, return INVALID_STACK_ID from getWorkspaceId when there is no associated workspace. This leaves the caller free to default." 2015-08-21 16:21:51 +00:00
Robert Carr
49cbf6ba24 ActivityManagerService: Rather than throw an exception, return 
INVALID_STACK_ID from getWorkspaceId when there is no associated
workspace. This leaves the caller free to default.

PhoneWindow: Default to FULLSCREEN_WORKSPACE_STACK_ID in the case
of INVALID_STACK_ID returned from the ActivityManagerService.

Bug: #23171731

Change-Id: Id5132337459bd2ef81b2416434d7657b6f3d1855
 2015-08-21 16:21:09 +00:00
Clara Bayarri
0b578f90fa Merge "Fix TextViewTest#testProcessTextActivityResultNonEditable" 2015-08-21 15:08:02 +00:00
Nicolas Prévot
3e465f9c8c Merge "Clear cross-profile intent filters in the right user." 2015-08-21 14:49:09 +00:00
Clara Bayarri
d7e48e1e21 Fix TextViewTest#testProcessTextActivityResultNonEditable 
BUG: 23404902
Change-Id: I0b70d3895d0dbfb66fa64a0f7a5cc6c21ace122f
 2015-08-21 15:23:24 +01:00
Nicolas Prevot
4afb83e912 Clear cross-profile intent filters in the right user. 
Clear them in the parent, who is not always the owner.

BUG:23105562
Change-Id: Iae2adbfa6b4d6e982f6f2a4075dd8bd55b11c37e
 2015-08-21 15:19:53 +01:00
Svetoslav Ganov
dec9a216d2 am f18cbd76: am c9dec164: am e96b80f3: am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit 'f18cbd760142e627ab6c9672e4aca3a29d05d9ee':
  Add missing removed permissions to the platform manifest
 2015-08-21 13:07:38 +00:00
Svetoslav Ganov
f18cbd7601 am c9dec164: am e96b80f3: am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit 'c9dec164609471227d519cf97df89a8049907065':
  Add missing removed permissions to the platform manifest
 2015-08-21 13:01:50 +00:00
Svetoslav Ganov
c9dec16460 am e96b80f3: am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit 'e96b80f3deb7a49225112d497dcf75cc4211b092':
  Add missing removed permissions to the platform manifest
 2015-08-21 12:55:58 +00:00
Svetoslav Ganov
e96b80f3de am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit '446c00a2919da5b4ea0bdf08f72ac4f95125ea45':
  Add missing removed permissions to the platform manifest
 2015-08-21 12:49:42 +00:00
Svetoslav Ganov
446c00a291 am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit 'cb59747de7222bc7310162c4174f7b460c34adef':
  Add missing removed permissions to the platform manifest
 2015-08-21 12:41:29 +00:00
Svetoslav Ganov
cb59747de7 Merge "Add missing removed permissions to the platform manifest" into mnc-dev 2015-08-21 12:34:37 +00:00
Sebastien Hertz
a2faffafc6 am 25e3ed83: (-s ours) am 0fbbe38b: am 36970140: am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '25e3ed8334a6a6df525862425ec510296f9ad8c3':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:44:38 +00:00
Sebastien Hertz
25e3ed8334 am 0fbbe38b: am 36970140: am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '0fbbe38b86ff1747587e893f1824c068727b068f':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:37:48 +00:00
Sebastien Hertz
0fbbe38b86 am 36970140: am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '36970140f3ce6ce66f3873e2091841f97efdd390':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:30:41 +00:00
Sebastien Hertz
36970140f3 am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '79cb3ef99eec49df785c1b93a743db32c1388af8':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:23:42 +00:00
Sebastien Hertz
79cb3ef99e am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '7cd2d3431c157fa20576e84a8a9f04ba4f7e1dd9':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:14:23 +00:00
Sebastien Hertz
7cd2d3431c am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '852c6178629d3bdcd7d2c958379b0b71539f460f':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:10:18 +00:00
Sebastien Hertz
852c617862 am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit 'b63e291d05aa9522b2ef9b399936c52079820c3f':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:02:27 +00:00
Sebastien Hertz
b63e291d05 am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '88556ac22157ddfe154be6ee7c8853e0a81dc83c':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:53:07 +00:00
Sebastien Hertz
88556ac221 am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '599dc2bd1c809ae5a413fc3800fc3fbb71432de6':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:37:46 +00:00
Sebastien Hertz
599dc2bd1c am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '50af68e74a756d0fc81eda2a3580dbcf70362d42':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:29:30 +00:00
Sebastien Hertz
0ab6293edb am 53455357: am b56c6437: am b1d01411: am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
* commit '534553579228d7802b410b4cec41b8c0f4fd9079':
  Allow debugging only for apps forked from zygote
 2015-08-21 10:29:28 +00:00
Sebastien Hertz
5345535792 am b56c6437: am b1d01411: am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
* commit 'b56c6437c5edd58bfa6f7e101d22e778adae3c15':
  Allow debugging only for apps forked from zygote
 2015-08-21 10:21:28 +00:00
Sebastien Hertz
50af68e74a am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '55f86b1811f0411a5d685d6c97772b846a706e19':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:18:38 +00:00
Sebastien Hertz
b56c6437c5 am b1d01411: am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
* commit 'b1d01411f4daafd5a07619d7c2060f99db61a64b':
  Allow debugging only for apps forked from zygote
 2015-08-21 10:15:47 +00:00
Sebastien Hertz
b1d01411f4 am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
* commit '5d2faf111e18fc44163ec4fe3cc8c6151d3e6aeb':
  Allow debugging only for apps forked from zygote
 2015-08-21 10:10:18 +00:00
Sebastien Hertz
55f86b1811 am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:09:22 +00:00
Sebastien Hertz
5d2faf111e am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
* commit 'c5151d2c378e4dad4d1312caf2021d7515297d06':
  Allow debugging only for apps forked from zygote
 2015-08-21 10:03:51 +00:00
Sebastien Hertz
9e7a0ddb65 am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '18089ceb71ad4ce2332096b8e7b5f8c1f8e263db':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 09:50:24 +00:00
Sebastien Hertz
c5151d2c37 am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
* commit 'b60bc0ece2b2714845eff37c97cb19d41a308122':
  Allow debugging only for apps forked from zygote
 2015-08-21 09:49:11 +00:00
Sebastien Hertz
b60bc0ece2 resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
Change-Id: I4cb38241b5efab1eb7af161e1589fa477a473a39
 2015-08-21 09:53:41 +02:00
Sebastien Hertz
a2d193183f am 87a786af: am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote 
* commit '87a786afdba8ec94036c62fb58265d364a7064ae':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:19:10 +00:00
Sebastien Hertz
87a786afdb am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote 
* commit '445ab7fa43f32ac1a256b15f5ab2bd619e9711e4':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:08:43 +00:00
Sebastien Hertz
445ab7fa43 am ff8dc212: Allow debugging only for apps forked from zygote 
* commit 'ff8dc21278b19b22ed8dc9f9475850838336d351':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:01:02 +00:00
Christopher Tate
6578ad5bb4 am 905cb17f: am adde39d8: am b893c1ba: am 99b252ad: am ddc2536d: Make sure to kill restore-at-install full-data targets after restore 
* commit '905cb17f921a804fde3679a2f8887055ec7db028':
  Make sure to kill restore-at-install full-data targets after restore
 2015-08-21 01:35:49 +00:00
Christopher Tate
905cb17f92 am adde39d8: am b893c1ba: am 99b252ad: am ddc2536d: Make sure to kill restore-at-install full-data targets after restore 
* commit 'adde39d8e70b259bfef14694b27ae2c1954a55ba':
  Make sure to kill restore-at-install full-data targets after restore
 2015-08-21 01:23:49 +00:00
Tomasz Mikolajewski
7f2aba0fb9 Merge "Wire uploading to MtpDocumentsProvider." 2015-08-21 01:08:12 +00:00
Doris Liu
eca905c466 Merge "Test for end value when ValueAnimators end" 2015-08-21 00:54:14 +00:00
Doris Liu
435d2f72b3 Test for end value when ValueAnimators end 
Change-Id: Iaec25a3e2379fd32ee003bff9670f8fde8b4038f
 2015-08-20 17:49:23 -07:00
Wale Ogunwale
21fdd916a7 Make wallpaper visible in freeform mode. 
The system requires at less one window to be
a wallpaper target in order to make the wallpaper visible.
For example the home and recents activities are both
wallpaper targets. For the case of the freeform workspace
there is no activity/window that is a wallpaper target.
We now make the wallpaper window target itself when in freeform
mode so we don't need an additional window to make it visible.

Change-Id: I6553c0fcec770e931c08bed8ef5c533b47afe1b8
 2015-08-20 23:38:38 +00:00
Wale Ogunwale
576d7f11e4 Merge "Made WallpaperControler.adjustWallpaperWindow more readable" 2015-08-20 23:36:17 +00:00
Yohei Yukawa
e6163081c9 Merge "Add missing test annotations for Ibdafe89474dd69c5b70c67ec98fed4." 2015-08-20 23:33:35 +00:00
Christopher Tate
adde39d8e7 am b893c1ba: am 99b252ad: am ddc2536d: Make sure to kill restore-at-install full-data targets after restore 
* commit 'b893c1ba4957b608a84b64aee14e6c42380ed3c0':
  Make sure to kill restore-at-install full-data targets after restore
 2015-08-20 23:23:51 +00:00
Christopher Tate
b893c1ba49 am 99b252ad: am ddc2536d: Make sure to kill restore-at-install full-data targets after restore 
* commit '99b252adc78a0450b7a881aff93a77f6d0e160ce':
  Make sure to kill restore-at-install full-data targets after restore
 2015-08-20 23:15:29 +00:00
Wale Ogunwale
5f61d04af6 Made WallpaperControler.adjustWallpaperWindow more readable 
Change-Id: I0725c59c0dfdf33e1e8063a432862bf17bf33ed7
 2015-08-20 16:12:43 -07:00
Christopher Tate
99b252adc7 am ddc2536d: Make sure to kill restore-at-install full-data targets after restore 
* commit 'ddc2536d2b6f277a7828278a066be874e4f9502e':
  Make sure to kill restore-at-install full-data targets after restore
 2015-08-20 23:09:39 +00:00
Filip Gruszczynski
c12e6780e4 Merge "API for specifying size/gravity of launching activity." 2015-08-20 22:43:25 +00:00