Treehugger Robot
b7d8cd1e48
Merge "DO NOT MERGE"
2018-12-07 01:38:19 +00:00
The Android Open Source Project
db61aad1a7
DO NOT MERGE
...
Merge pie-platform-release (PPRL.181105.017, history only) into master
Bug: 118454372
Change-Id: I0916dec2742f3739f34335c437f38a193723b928
2018-12-06 14:11:38 -08:00
Bill Yi
179d6ff214
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
...
Change-Id: Idf68376883e0821c398aae9449f6703a494d4886
2018-11-28 18:34:52 -08:00
Bill Yi
f880549235
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: If5698c0fe3623a933d66fcb6b5919d8e40f74e7c
2018-10-24 14:47:24 -07:00
Bill Yi
cbab862cf8
Merge pi-dr1-dev to aosp-master
...
Change-Id: I3bdbba15a0bc0d2b5140ed92972f6650af91ef26
2018-10-19 12:20:46 -07:00
Shibin George
e723daa0d0
Merge "Launcher3Go should override Launcher3QuickStep"
...
am: 08fa0914a4
Change-Id: I596451f4c23499fa0e21992d63ea19dfb66c6cf4
2018-09-04 10:56:58 -07:00
Treehugger Robot
08fa0914a4
Merge "Launcher3Go should override Launcher3QuickStep"
2018-09-04 17:44:33 +00:00
Shibin George
20f22d992d
Launcher3Go should override Launcher3QuickStep
...
Now that Launcher3QuickStep is the default launcher,
Launcher3Go should override Launcher3QuickStep as well
else Go targets will have both Launcher3Go and
Launcher3QuickStep apks installed in system image.
Also, Launcher3QuickStepGo should override Launcher3QuickStep.
BUG: 113564404
Test: With this, on Go targets where Launcher3Go is
included in PRODUCT_PACKAGES, only one apk i.e. Launcher3Go
will be present in /system/priv-app.
Change-Id: I84d2e3c23c5acdced70d028e9518e04834577049
2018-09-04 20:43:03 +05:30
Tobias Dubois
9955f04d5f
Merge "Lint fix: IS_DEBUG_DEVICE: Implied default locale"
...
am: 1194b218d6
Change-Id: I51e1d74955d14d631e90c5c70c7375ccb9d18470
2018-08-23 14:06:08 -07:00
Treehugger Robot
1194b218d6
Merge "Lint fix: IS_DEBUG_DEVICE: Implied default locale"
2018-08-23 20:49:59 +00:00
Tobias Dubois
bb57b5bfab
Merge "Use View.getHeight() instead of Canvas.getHeight() for PageIndicatorDots"
...
am: c66f5ebd63
Change-Id: I248336bdb569519ecf8b17657344bc154373f197
2018-08-23 12:08:07 -07:00
Treehugger Robot
c66f5ebd63
Merge "Use View.getHeight() instead of Canvas.getHeight() for PageIndicatorDots"
2018-08-23 18:56:39 +00:00
Tobias Dubois
d38f791b68
Lint fix: IS_DEBUG_DEVICE: Implied default locale
...
Use the ROOT locale to make sure toLowerCase has consistent behavior
regardless of the currently set language.
Test: Manual
Change-Id: Ie43f76cbc15eee0d96314e92d2acd5abb22f7077
2018-08-16 20:10:25 +00:00
Tobias Dubois
83b042c897
Use View.getHeight() instead of Canvas.getHeight() for PageIndicatorDots
...
Use View.getHeight() instead of Canvas.getHeight() to get the same height
regardless of using hardware or software accelerated drawing.
Test: manual
Change-Id: I475afef017102d7968f28a7aab8116238af3d90d
2018-08-16 10:46:34 +02:00
Xin Li
ec037c9092
Merge stage-dr1-aosp-master into stage-aosp-master
...
Bug: 112535855
Change-Id: I46a5819898fbfc2ce0404691755be6f74c32c0fb
2018-08-13 13:01:17 -07:00
Sunny Goyal
bc742b6a4f
Merge "Fix overlapping FloatingViewType IntDef" am: c73828fd96
...
am: ad61ce0767
Change-Id: Id87a75c690131e1c2e2ac48f5a07dd89fb6976ca
2018-08-08 12:43:18 -07:00
Sunny Goyal
ad61ce0767
Merge "Fix overlapping FloatingViewType IntDef"
...
am: c73828fd96
Change-Id: I2b5f60a83ed1f07050f95f4c4240682f7ec480f6
2018-08-08 12:39:13 -07:00
Sunny Goyal
c73828fd96
Merge "Fix overlapping FloatingViewType IntDef"
2018-08-08 19:24:33 +00:00
Tobias Dubois
1e63367b94
Fix overlapping FloatingViewType IntDef
...
TYPE_DISCOVERY_BOUNCE and TYPE_QUICKSTEP_PREVIEW have the same value.
Make sure each flag has a unique value.
Test: manual
Change-Id: I0fec3f27ffc31bad80d3af7b3baa3631b61b2567
2018-08-08 13:47:28 +02:00
Xin Li
444b52a18f
Merge "Merge Android Pie into master" am: 90a54e7375
...
am: acaffe609c
Change-Id: I1ccac006a68400ebbed9fadd6fb04001a6b4eb4f
2018-08-07 18:30:18 -07:00
Xin Li
acaffe609c
Merge "Merge Android Pie into master"
...
am: 90a54e7375
Change-Id: Ibcbb2f3009f8a7d16cdee17fcd95302b2842c1e4
2018-08-07 14:59:17 -07:00
Xin Li
90a54e7375
Merge "Merge Android Pie into master"
2018-08-07 16:51:25 +00:00
Xin Li
ccb8ed4d5e
Merge Android Pie into master
...
Bug: 112104996
Change-Id: I9e4f0960dc59342994e4aea3b6f7059a3fc6cf89
2018-08-06 16:51:19 -07:00
Xin Li
0310b7bc82
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
...
am: 8e6721ce0d
Change-Id: I4d4e59f7181949698550cf88098418277917295a
2018-07-19 23:44:50 -07:00
Xin Li
8e6721ce0d
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
...
Bug: 111615259
Change-Id: Ica914087442628febc4671ca3c20e555a234a677
2018-07-19 13:50:34 -07:00
Jon
eb3e99bd11
Merge branch 'ub-launcher3-edmonton-polish' into pi-dev
...
am: 0fd1472b94
Change-Id: Ib3e4a8a65875a76ba0f772619f44130f94dc4dad
2018-07-16 17:04:47 -07:00
Jon
0fd1472b94
Merge branch 'ub-launcher3-edmonton-polish' into pi-dev
...
Bug: 111438498
Bug: 80134723
Test: manual
Change-Id: If50f0cfd7ce02978eb0d2ab3a8d5e2c1550548c6
2018-07-13 14:41:28 -04:00
Winson Chung
35a6848fa8
Workaround for flicker between handoff from app to task view
...
- Defer finishing the recents animation for a couple frames until the
frame has likely been pushed to sf and drawn, otherwise the reparenting
of the app surface may happen before the task view is visible in
Launcher.
Bug: 111299394
Test: Swipe up repeatedly from an app
Change-Id: I627dc085a5e376436b2b8eb5841c45fd36deff42
2018-07-11 11:00:03 -07:00
TreeHugger Robot
f912bd955f
Merge changes from topic "am-b2190f70-93ef-44e6-8473-41d098cf486b" into ub-launcher3-edmonton-polish
...
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: d7a20ce619
Import translations. DO NOT MERGE
2018-06-29 00:56:59 +00:00
Hyunyoung Song
82d0835fa5
Fix clipping issue on adaptive icons
...
Bug: 62372639
Verified the one last device, b***line.
Change-Id: I1d97d0cbe0afe76ee21de5964abf639fb4c0fceb
2018-06-28 15:19:05 -07:00
Android Build Merger (Role)
18b5715113
[automerger skipped] Import translations. DO NOT MERGE skipped: d7a20ce619
...
Change-Id: Ic2480c1add8ddafa803b5e5d30f2adaf2b3813cc
2018-06-28 19:07:33 +00:00
Bill Yi
d7a20ce619
Import translations. DO NOT MERGE
...
Change-Id: Ieabec06db1791c1b2887c37aa600f2178906d761
Auto-generated-cl: translation import
2018-06-28 12:07:24 -07:00
Hyunyoung Song
7d4ef41cb4
Fix clipping issue on adaptive icons
...
Bug: 62372639
Change-Id: Ie9dcf18f61c45225823dfbbf85578edcbffd86b9
2018-06-28 11:33:23 -07:00
Adam Cohen
d63e6dff28
Last minute swipe up overshoot tweaks
...
b/109709720
Change-Id: Ie3831289a9af2ba4b03fcbb4f2cbb3f4c2431aec
2018-06-27 15:57:12 -07:00
Tony Wickham
969abca838
Merge "Swipe up overshoot always plays" into ub-launcher3-edmonton-polish
2018-06-27 21:00:54 +00:00
Tony
cc3755da6e
Swipe up overshoot always plays
...
Instead of using an OvershootInterpolator, we adjust the end progress to > 1 and
add a second interpolator to settle back to 1. That way, even if the animation runs
starting very late, e.g. 1.0, it still has room to overshoot. We use this same
OvershootParams class to calculate an overshoot for a blocked long fling as well.
Bug: 109709720
Change-Id: I43152237e4350f93e7c462c22e68d09d05c1dd57
2018-06-27 12:25:35 -07:00
Jonathan Miranda
f274996ef3
Revert "Add stagger and "springs" to app closing transition."
...
This reverts commit cd57901ca4 .
Reason for revert: <INSERT REASONING HERE>
Change-Id: I13e9d2db8f6d6118a1448ba04b67c81b4e485447
2018-06-26 23:24:20 +00:00
Jonathan Miranda
6a2a1a91a0
Revert "Refactor "spring" code into one method."
...
This reverts commit b83c71aa24 .
Reason for revert: <INSERT REASONING HERE>
Change-Id: I747dfc2ed63709f5f4032b4d4bd2cf3cd5d9e8ce
2018-06-26 23:00:44 +00:00
Jonathan Miranda
33cbe61e97
Revert "Fix typo in horizontalShift"
...
This reverts commit e45b3e21a9 .
Reason for revert: <INSERT REASONING HERE>
Change-Id: I4d2956d3f8d23e8f9579fd61418bc84e7226ef60
2018-06-26 22:33:44 +00:00
Jonathan Miranda
3d80330efc
Merge "Revert "Tune app closing/launcher resume animation "spring" values."" into ub-launcher3-edmonton-polish
2018-06-26 22:32:37 +00:00
Tracy Zhou
626467130f
Add additional call to onStop() to stablize PIP position.
...
Bug: 110799409
Test: Manual
Change-Id: I361eeadbf298bb239d8e373f3c6fa49d1f2410a6
2018-06-26 14:19:02 -07:00
Jonathan Miranda
5023771e05
Revert "Tune app closing/launcher resume animation "spring" values."
...
This reverts commit c9a7c50fac .
Reason for revert: <INSERT REASONING HERE>
Change-Id: I7ed4270b742803265ed4e3e13b63688842e0b48c
2018-06-26 20:21:07 +00:00
Jon Miranda
c9a7c50fac
Tune app closing/launcher resume animation "spring" values.
...
Bug: 109828964
Change-Id: I64252667451f511b7affdde5ffb28812876e7f4c
2018-06-25 16:42:58 -07:00
Jon
58ae9cbca6
Merge branch 'ub-launcher3-edmonton-polish' into pi-dev
...
am: 1748c4ad61
Change-Id: I1de19c48f5e884742c8f010530519dc0f0593f2c
2018-06-25 11:49:34 -07:00
TreeHugger Robot
563bc3d1fa
Merge "Invoking splitscreen takes snapshot of task without scrim" into ub-launcher3-edmonton-polish
2018-06-22 23:21:00 +00:00
Matthew Ng
26f02037cd
Invoking splitscreen takes snapshot of task without scrim
...
Change-Id: I456200f9f61f12b7b80a2604cfeffc2fa16711ce
Fixes: 109676098
Test: splitscreen in overview
2018-06-22 23:10:23 +00:00
TreeHugger Robot
c22289b69e
Merge "Touching outside the task in overview goes home" into ub-launcher3-edmonton-polish
2018-06-22 17:44:37 +00:00
Jon
1748c4ad61
Merge branch 'ub-launcher3-edmonton-polish' into pi-dev
...
Bug: 110425849
Bug: 80134723
Test: manual
Change-Id: I0cf89a4ee08ff2a36e5a586f7e0c04ae970bf13c
2018-06-21 21:14:05 -04:00
Jonathan Miranda
b635be59c0
Merge "Add @Test and @Ignore to untested test methods in RequestPinItemTest." into ub-launcher3-edmonton-polish
2018-06-22 01:12:07 +00:00
TreeHugger Robot
f6ab06df8b
Merge "Fetching assist data only if required by overlay" into ub-launcher3-edmonton-polish
2018-06-22 00:57:57 +00:00