From 31f8aef7ac25aba146931fedd3be3490cb3c5321 Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Tue, 7 Mar 2023 13:50:33 -0800 Subject: [PATCH 1/8] Update All set page lottie animation files Fixes: 270223298 Test: Ran all set page on large screen device Change-Id: Ie28c8f40de22b3558f6e9eb76fa39c93640235e0 --- quickstep/res/raw-sw600dp-land/all_set_page_bg.json | 2 +- quickstep/res/raw-sw600dp/all_set_page_bg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstep/res/raw-sw600dp-land/all_set_page_bg.json b/quickstep/res/raw-sw600dp-land/all_set_page_bg.json index 0863c31f61..f53128cbdf 100644 --- a/quickstep/res/raw-sw600dp-land/all_set_page_bg.json +++ b/quickstep/res/raw-sw600dp-land/all_set_page_bg.json @@ -1 +1 @@ -{"v":"5.9.0","fr":60,"ip":0,"op":180,"w":1280,"h":800,"nm":"3Second_MainWelcomeScreen_Tablet_Landscape_V02","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Null 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[288,540,0],"ix":2,"l":2},"a":{"a":0,"k":[50,50,0],"ix":1,"l":2},"s":{"a":0,"k":[25,25,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":600,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"colorAccentPrimaryVariant","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":180,"s":[56]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.07,"y":0.986},"o":{"x":0.167,"y":0.167},"t":0,"s":[231.832,-1174.545,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.773,"y":0.01},"t":95,"s":[231.832,-1979,0],"to":[0,0,0],"ti":[0,0,0]},{"t":180,"s":[231.832,-1174.545,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-3514.717,-358.642,0],"ix":1,"l":2},"s":{"a":0,"k":[110,110,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[75.615,-96.908],[89.338,-70.276],[111.99,-50.668],[111.764,-20.709],[122.709,7.18],[108.586,33.602],[105.316,63.383],[80.533,80.216],[63.797,105.066],[34.03,108.453],[7.663,122.679],[-20.269,111.845],[-50.226,112.189],[-69.924,89.614],[-96.61,75.997],[-103.56,46.854],[-120.861,22.395],[-113.472,-6.639],[-117.425,-36.337],[-97.389,-58.612],[-87.087,-86.745],[-58.996,-97.158],[-36.8,-117.281],[-7.086,-113.445],[21.918,-120.948],[46.446,-103.744]],"o":[[-75.615,96.909],[-89.338,70.276],[-111.99,50.668],[-111.764,20.709],[-122.709,-7.18],[-108.586,-33.602],[-105.316,-63.383],[-80.533,-80.216],[-63.797,-105.066],[-34.03,-108.453],[-7.663,-122.679],[20.269,-111.845],[50.226,-112.188],[69.924,-89.614],[96.61,-75.997],[103.56,-46.854],[120.861,-22.395],[113.472,6.64],[117.425,36.337],[97.389,58.612],[87.088,86.745],[58.995,97.158],[36.8,117.281],[7.087,113.445],[-21.918,120.948],[-46.446,103.744]],"v":[[733.209,572.105],[531.711,675.932],[383.354,847.313],[156.685,845.606],[-54.323,928.412],[-254.235,821.562],[-479.555,796.823],[-606.913,609.309],[-794.927,482.691],[-820.554,257.47],[-928.191,57.981],[-846.217,-153.353],[-848.817,-380.013],[-678.021,-529.044],[-574.99,-730.949],[-354.499,-783.537],[-169.439,-914.435],[50.234,-858.532],[274.928,-888.434],[443.46,-736.847],[656.313,-658.903],[735.094,-446.359],[887.344,-278.426],[858.327,-53.616],[915.095,165.835],[784.928,351.409]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.839215686275,0.439215686275,0.388235294118,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-3509.952,-363.731],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":720,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"colorAccentPrimary","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.248]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-56]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.172]},"t":95,"s":[-38]},{"t":180,"s":[-56]}],"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.032]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[138]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.022]},"t":95,"s":[-38]},{"t":180,"s":[138]}],"ix":3},"y":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.034]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[1535]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.024]},"t":95,"s":[1338]},{"t":180,"s":[1535]}],"ix":4}},"a":{"a":0,"k":[164.438,1433.781,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3079.125,4685.989],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.305882352941,0.309803921569,0.321568627451,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[164.438,1481.781],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.8.1","fr":60,"ip":0,"op":180,"w":1280,"h":800,"nm":"3Second_MainWelcomeScreen_Tablet_Landscape_V02","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Null 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[288,540,0],"ix":2,"l":2},"a":{"a":0,"k":[50,50,0],"ix":1,"l":2},"s":{"a":0,"k":[25,25,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":600,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"F4BA9E","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":180,"s":[56]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.07,"y":0.986},"o":{"x":0.167,"y":0.167},"t":0,"s":[375.832,-1006.545,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.773,"y":0.01},"t":95,"s":[375.832,-1811,0],"to":[0,0,0],"ti":[0,0,0]},{"t":180,"s":[375.832,-1006.545,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-3514.717,-358.642,0],"ix":1,"l":2},"s":{"a":0,"k":[110,110,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[75.615,-96.908],[89.338,-70.276],[111.99,-50.668],[111.764,-20.709],[122.709,7.18],[108.586,33.602],[105.316,63.383],[80.533,80.216],[63.797,105.066],[34.03,108.453],[7.663,122.679],[-20.269,111.845],[-50.226,112.189],[-69.924,89.614],[-96.61,75.997],[-103.56,46.854],[-120.861,22.395],[-113.472,-6.639],[-117.425,-36.337],[-97.389,-58.612],[-87.087,-86.745],[-58.996,-97.158],[-36.8,-117.281],[-7.086,-113.445],[21.918,-120.948],[46.446,-103.744]],"o":[[-75.615,96.909],[-89.338,70.276],[-111.99,50.668],[-111.764,20.709],[-122.709,-7.18],[-108.586,-33.602],[-105.316,-63.383],[-80.533,-80.216],[-63.797,-105.066],[-34.03,-108.453],[-7.663,-122.679],[20.269,-111.845],[50.226,-112.188],[69.924,-89.614],[96.61,-75.997],[103.56,-46.854],[120.861,-22.395],[113.472,6.64],[117.425,36.337],[97.389,58.612],[87.088,86.745],[58.995,97.158],[36.8,117.281],[7.087,113.445],[-21.918,120.948],[-46.446,103.744]],"v":[[733.209,572.105],[531.711,675.932],[383.354,847.313],[156.685,845.606],[-54.323,928.412],[-254.235,821.562],[-479.555,796.823],[-606.913,609.309],[-794.927,482.691],[-820.554,257.47],[-928.191,57.981],[-846.217,-153.353],[-848.817,-380.013],[-678.021,-529.044],[-574.99,-730.949],[-354.499,-783.537],[-169.439,-914.435],[50.234,-858.532],[274.928,-888.434],[443.46,-736.847],[656.313,-658.903],[735.094,-446.359],[887.344,-278.426],[858.327,-53.616],[915.095,165.835],[784.928,351.409]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.956862745098,0.729411764706,0.619607843137,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-3509.952,-363.731],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":720,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"C0C9C0","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.248]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[57]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.172]},"t":95,"s":[75]},{"t":180,"s":[57]}],"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.032]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[2618]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.022]},"t":95,"s":[2442]},{"t":180,"s":[2618]}],"ix":3},"y":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.034]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[891]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.024]},"t":95,"s":[694]},{"t":180,"s":[891]}],"ix":4}},"a":{"a":0,"k":[164.438,1433.781,0],"ix":1,"l":2},"s":{"a":0,"k":[120,120,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3079.125,4685.989],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.752941176471,0.788235294118,0.752941176471,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[164.438,1481.781],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/quickstep/res/raw-sw600dp/all_set_page_bg.json b/quickstep/res/raw-sw600dp/all_set_page_bg.json index 14e8933da8..b2dd530551 100644 --- a/quickstep/res/raw-sw600dp/all_set_page_bg.json +++ b/quickstep/res/raw-sw600dp/all_set_page_bg.json @@ -1 +1 @@ -{"v":"5.9.0","fr":60,"ip":0,"op":180,"w":800,"h":1280,"nm":"3Second_MainWelcomeScreen_Tablet_Portrait_V02","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":1,"nm":"Null 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[288,528,0],"ix":2,"l":2},"a":{"a":0,"k":[50,50,0],"ix":1,"l":2},"s":{"a":0,"k":[25,25,100],"ix":6,"l":2}},"ao":0,"sw":100,"sh":100,"sc":"#ffffff","ip":600,"op":600,"st":0,"bm":0,"hidden":0},{"ddd":0,"ind":2,"ty":4,"nm":".colorAccentPrimaryVariant","cl":"colorAccentPrimaryVariant","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":180,"s":[56]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.07,"y":0.986},"o":{"x":0.167,"y":0.167},"t":0,"s":[375.832,-1366.545,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.773,"y":0.01},"t":95,"s":[375.832,-2171,0],"to":[0,0,0],"ti":[0,0,0]},{"t":180,"s":[375.832,-1366.545,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-3514.717,-358.642,0],"ix":1,"l":2},"s":{"a":0,"k":[135,135,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[75.615,-96.908],[89.338,-70.276],[111.99,-50.668],[111.764,-20.709],[122.709,7.18],[108.586,33.602],[105.316,63.383],[80.533,80.216],[63.797,105.066],[34.03,108.453],[7.663,122.679],[-20.269,111.845],[-50.226,112.189],[-69.924,89.614],[-96.61,75.997],[-103.56,46.854],[-120.861,22.395],[-113.472,-6.639],[-117.425,-36.337],[-97.389,-58.612],[-87.087,-86.745],[-58.996,-97.158],[-36.8,-117.281],[-7.086,-113.445],[21.918,-120.948],[46.446,-103.744]],"o":[[-75.615,96.909],[-89.338,70.276],[-111.99,50.668],[-111.764,20.709],[-122.709,-7.18],[-108.586,-33.602],[-105.316,-63.383],[-80.533,-80.216],[-63.797,-105.066],[-34.03,-108.453],[-7.663,-122.679],[20.269,-111.845],[50.226,-112.188],[69.924,-89.614],[96.61,-75.997],[103.56,-46.854],[120.861,-22.395],[113.472,6.64],[117.425,36.337],[97.389,58.612],[87.088,86.745],[58.995,97.158],[36.8,117.281],[7.087,113.445],[-21.918,120.948],[-46.446,103.744]],"v":[[733.209,572.105],[531.711,675.932],[383.354,847.313],[156.685,845.606],[-54.323,928.412],[-254.235,821.562],[-479.555,796.823],[-606.913,609.309],[-794.927,482.691],[-820.554,257.47],[-928.191,57.981],[-846.217,-153.353],[-848.817,-380.013],[-678.021,-529.044],[-574.99,-730.949],[-354.499,-783.537],[-169.439,-914.435],[50.234,-858.532],[274.928,-888.434],[443.46,-736.847],[656.313,-658.903],[735.094,-446.359],[887.344,-278.426],[858.327,-53.616],[915.095,165.835],[784.928,351.409]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.839215686275,0.439215686275,0.388235294118,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-3509.952,-363.731],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":720,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".colorAccentPrimary","cl":"colorAccentPrimary","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.248]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-56]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.172]},"t":95,"s":[-38]},{"t":180,"s":[-56]}],"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.032]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[138]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.022]},"t":95,"s":[-38]},{"t":180,"s":[138]}],"ix":3},"y":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.034]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[1535]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.024]},"t":95,"s":[1338]},{"t":180,"s":[1535]}],"ix":4}},"a":{"a":0,"k":[164.438,1433.781,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3079.125,4685.989],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.305882352941,0.309803921569,0.321568627451,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[164.438,1481.781],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.8.1","fr":60,"ip":0,"op":180,"w":800,"h":1280,"nm":"3Second_MainWelcomeScreen_Tablet_Portrait_V02","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Null 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[288,528,0],"ix":2,"l":2},"a":{"a":0,"k":[50,50,0],"ix":1,"l":2},"s":{"a":0,"k":[25,25,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":600,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"F4BA9E","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":180,"s":[56]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.07,"y":0.986},"o":{"x":0.167,"y":0.167},"t":0,"s":[999.832,-2238.545,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.773,"y":0.01},"t":95,"s":[999.832,-3043,0],"to":[0,0,0],"ti":[0,0,0]},{"t":180,"s":[999.832,-2238.545,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-3514.717,-358.642,0],"ix":1,"l":2},"s":{"a":0,"k":[200,200,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[75.615,-96.908],[89.338,-70.276],[111.99,-50.668],[111.764,-20.709],[122.709,7.18],[108.586,33.602],[105.316,63.383],[80.533,80.216],[63.797,105.066],[34.03,108.453],[7.663,122.679],[-20.269,111.845],[-50.226,112.189],[-69.924,89.614],[-96.61,75.997],[-103.56,46.854],[-120.861,22.395],[-113.472,-6.639],[-117.425,-36.337],[-97.389,-58.612],[-87.087,-86.745],[-58.996,-97.158],[-36.8,-117.281],[-7.086,-113.445],[21.918,-120.948],[46.446,-103.744]],"o":[[-75.615,96.909],[-89.338,70.276],[-111.99,50.668],[-111.764,20.709],[-122.709,-7.18],[-108.586,-33.602],[-105.316,-63.383],[-80.533,-80.216],[-63.797,-105.066],[-34.03,-108.453],[-7.663,-122.679],[20.269,-111.845],[50.226,-112.188],[69.924,-89.614],[96.61,-75.997],[103.56,-46.854],[120.861,-22.395],[113.472,6.64],[117.425,36.337],[97.389,58.612],[87.088,86.745],[58.995,97.158],[36.8,117.281],[7.087,113.445],[-21.918,120.948],[-46.446,103.744]],"v":[[733.209,572.105],[531.711,675.932],[383.354,847.313],[156.685,845.606],[-54.323,928.412],[-254.235,821.562],[-479.555,796.823],[-606.913,609.309],[-794.927,482.691],[-820.554,257.47],[-928.191,57.981],[-846.217,-153.353],[-848.817,-380.013],[-678.021,-529.044],[-574.99,-730.949],[-354.499,-783.537],[-169.439,-914.435],[50.234,-858.532],[274.928,-888.434],[443.46,-736.847],[656.313,-658.903],[735.094,-446.359],[887.344,-278.426],[858.327,-53.616],[915.095,165.835],[784.928,351.409]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.956862745098,0.729411764706,0.619607843137,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-3509.952,-363.731],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":720,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"C0C9C0","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.248]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-39]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.172]},"t":95,"s":[-21]},{"t":180,"s":[-39]}],"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.032]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[1490]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.022]},"t":95,"s":[1314]},{"t":180,"s":[1490]}],"ix":3},"y":{"a":1,"k":[{"i":{"x":[0.07],"y":[1.034]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[2967]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.719],"y":[0.024]},"t":95,"s":[2770]},{"t":180,"s":[2967]}],"ix":4}},"a":{"a":0,"k":[164.438,1433.781,0],"ix":1,"l":2},"s":{"a":0,"k":[168,168,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3079.125,4685.989],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.752941176471,0.788235294118,0.752941176471,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[164.438,1481.781],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"bm":0}],"markers":[]} \ No newline at end of file From 3ddd00ee3c359c151e427d1dd922196deaf8082a Mon Sep 17 00:00:00 2001 From: Charlie Anderson Date: Tue, 14 Mar 2023 19:39:02 +0000 Subject: [PATCH 2/8] Revert "Revert "flip app shortcut popup design on for U"" This reverts commit 5156b48f6cb9927d7fc3b6f6a1e2251805b0f8d5. Reason for revert: Fixed test failures from flipping the flag on in ag/22066273 and ag/21992972 Change-Id: I0478869c22a8f23d81a688bfa07a40230521f638 --- src/com/android/launcher3/config/FeatureFlags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index e8ef3427d9..e5cdd6e56c 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -302,7 +302,7 @@ public final class FeatureFlags { + " is enabled or in prefix state"); public static final BooleanFlag ENABLE_MATERIAL_U_POPUP = getDebugFlag(270395516, - "ENABLE_MATERIAL_U_POPUP", false, "Switch popup UX to use material U"); + "ENABLE_MATERIAL_U_POPUP", true, "Switch popup UX to use material U"); public static final BooleanFlag ENABLE_SEARCH_UNINSTALLED_APPS = getReleaseFlag(270395269, "ENABLE_SEARCH_UNINSTALLED_APPS", false, "Search uninstalled app results."); From b1957cd6fb95b179a120657ad9be426c22c56897 Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Tue, 14 Mar 2023 13:27:30 -0700 Subject: [PATCH 3/8] Set textSize and compound drawable padding for mDisplay == DISPLAY_SEARCH_RESULT This is so it matches closely to all apps icons but the difference is that the icon size is 48dp. bug: 261047689 test: manual - https://screenshot.googleplex.com/83YwnfwSfR6CJRB and https://screenshot.googleplex.com/68Yqz9hk5NHETKK Change-Id: I381d9415d2a80a9d36291828a1a31d0c83fc395e --- src/com/android/launcher3/BubbleTextView.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 801b740ca1..d5163ca2b8 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -219,6 +219,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, setCompoundDrawablePadding(grid.folderChildDrawablePaddingPx); defaultIconSize = grid.folderChildIconSizePx; } else if (mDisplay == DISPLAY_SEARCH_RESULT) { + setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx); + setCompoundDrawablePadding(grid.allAppsIconDrawablePaddingPx); defaultIconSize = getResources().getDimensionPixelSize(R.dimen.search_row_icon_size); } else if (mDisplay == DISPLAY_SEARCH_RESULT_SMALL) { defaultIconSize = getResources().getDimensionPixelSize( From a79d460736c6b6b8ca1ca8a9ca4d58bb7236d44f Mon Sep 17 00:00:00 2001 From: Mike Schneider Date: Fri, 3 Mar 2023 15:58:06 +0100 Subject: [PATCH 4/8] Add optional debug logging to on flag changes FlagDebugUtils.formatFlagChange() utility to always write the set of updated flags, with a list of actual changes applied. Examples: [allow_gesture|device_dozing] +[device_dozing] [] -[state_started] Additionally, moved the appendFlag utility to the new FlagDebugUtils Test: manually verifed the output in logcat Bug: 261418621 Change-Id: Ie4f2cfcd4b34f0a816db7845e1df4331babed07a --- .../taskbar/NavbarButtonsViewController.java | 2 +- .../TaskbarAutohideSuspendController.java | 2 +- .../launcher3/taskbar/TaskbarManager.java | 9 +++ .../taskbar/TaskbarStashController.java | 17 +++++- .../android/launcher3/taskbar/Utilities.java | 8 --- src/com/android/launcher3/BaseActivity.java | 56 +++++++++++++++---- .../android/launcher3/util/FlagDebugUtils.kt | 37 ++++++++++++ 7 files changed, 108 insertions(+), 23 deletions(-) create mode 100644 src/com/android/launcher3/util/FlagDebugUtils.kt diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 84bf02ec28..832adc7d89 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -32,7 +32,7 @@ import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IM import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS; import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_KEYGUARD; import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_SMALL_SCREEN; -import static com.android.launcher3.taskbar.Utilities.appendFlag; +import static com.android.launcher3.util.FlagDebugUtils.appendFlag; import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE; diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java index 1a54576a7e..2517ff671c 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java @@ -15,7 +15,7 @@ */ package com.android.launcher3.taskbar; -import static com.android.launcher3.taskbar.Utilities.appendFlag; +import static com.android.launcher3.util.FlagDebugUtils.appendFlag; import androidx.annotation.IntDef; diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index 8c918339f8..4c131eefc5 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -21,6 +21,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY; import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE; +import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange; import android.content.ComponentCallbacks; import android.content.Context; @@ -32,6 +33,7 @@ import android.net.Uri; import android.os.Handler; import android.os.SystemProperties; import android.provider.Settings; +import android.util.Log; import android.view.Display; import androidx.annotation.NonNull; @@ -51,6 +53,7 @@ import com.android.launcher3.util.SimpleBroadcastReceiver; import com.android.quickstep.RecentsActivity; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.TouchInteractionService; +import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.unfold.UnfoldTransitionProgressProvider; import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider; @@ -60,6 +63,8 @@ import java.io.PrintWriter; * Class to manage taskbar lifecycle */ public class TaskbarManager { + private static final String TAG = "TaskbarManager"; + private static final boolean DEBUG = false; public static final boolean FLAG_HIDE_NAVBAR_WINDOW = SystemProperties.getBoolean("persist.wm.debug.hide_navbar_window", false); @@ -320,6 +325,10 @@ public class TaskbarManager { } public void onSystemUiFlagsChanged(int systemUiStateFlags) { + if (DEBUG) { + Log.d(TAG, "SysUI flags changed: " + formatFlagChange(systemUiStateFlags, + mSharedState.sysuiStateFlags, QuickStepContract::getSystemUiStateString)); + } mSharedState.sysuiStateFlags = systemUiStateFlags; if (mTaskbarActivityContext != null) { mTaskbarActivityContext.updateSysuiStateFlags(systemUiStateFlags, false /* fromInit */); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index e0acd3eda3..cbc1672794 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -27,7 +27,8 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_SHOW; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TRANSIENT_TASKBAR_HIDE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TRANSIENT_TASKBAR_SHOW; -import static com.android.launcher3.taskbar.Utilities.appendFlag; +import static com.android.launcher3.util.FlagDebugUtils.appendFlag; +import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SWITCHER_SHOWING; @@ -75,6 +76,8 @@ import java.util.function.IntPredicate; * create a cohesive animation between stashed/unstashed states. */ public class TaskbarStashController implements TaskbarControllers.LoggableTaskbarController { + private static final String TAG = TaskbarStashController.class.getSimpleName(); + private static final boolean DEBUG = false; public static final int FLAG_IN_APP = 1 << 0; public static final int FLAG_STASHED_IN_APP_MANUAL = 1 << 1; // long press, persisted @@ -1095,12 +1098,22 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba */ @Nullable public Animator createSetStateAnimator(int flags, long duration) { + boolean isStashed = mStashCondition.test(flags); + + if (DEBUG) { + String stateString = formatFlagChange(flags, mPrevFlags, + TaskbarStashController::getStateString); + Log.d(TAG, "createSetStateAnimator: flags: " + stateString + + ", duration: " + duration + + ", isStashed: " + isStashed + + ", mIsStashed: " + mIsStashed); + } + int changedFlags = mPrevFlags ^ flags; if (mPrevFlags != flags) { onStateChangeApplied(changedFlags); mPrevFlags = flags; } - boolean isStashed = mStashCondition.test(flags); boolean isHotseatIconOnTopWhenAligned = mControllers.uiController.isHotseatIconOnTopWhenAligned(); // If an animation has started and mIsHotseatIconOnTopWhenAligned is changed, we need diff --git a/quickstep/src/com/android/launcher3/taskbar/Utilities.java b/quickstep/src/com/android/launcher3/taskbar/Utilities.java index a2b3c967df..47d6684727 100644 --- a/quickstep/src/com/android/launcher3/taskbar/Utilities.java +++ b/quickstep/src/com/android/launcher3/taskbar/Utilities.java @@ -16,8 +16,6 @@ package com.android.launcher3.taskbar; -import java.util.StringJoiner; - /** * Various utilities shared amongst the Taskbar's classes. */ @@ -25,12 +23,6 @@ public final class Utilities { private Utilities() {} - static void appendFlag(StringJoiner str, int flags, int flag, String flagName) { - if ((flags & flag) != 0) { - str.add(flagName); - } - } - /** * Sets drag, long-click, and split selection behavior on 1P and 3P launchers with Taskbar */ diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index e71391f907..855983fdad 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -16,6 +16,8 @@ package com.android.launcher3; +import static com.android.launcher3.util.FlagDebugUtils.appendFlag; +import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange; import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -26,6 +28,7 @@ import android.content.ContextWrapper; import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; +import android.util.Log; import android.window.OnBackInvokedDispatcher; import androidx.annotation.IntDef; @@ -43,6 +46,7 @@ import java.io.PrintWriter; import java.lang.annotation.Retention; import java.util.ArrayList; import java.util.List; +import java.util.StringJoiner; /** * Launcher BaseActivity @@ -50,6 +54,7 @@ import java.util.List; public abstract class BaseActivity extends Activity implements ActivityContext { private static final String TAG = "BaseActivity"; + static final boolean DEBUG = false; public static final int INVISIBLE_BY_STATE_HANDLER = 1 << 0; public static final int INVISIBLE_BY_APP_TRANSITIONS = 1 << 1; @@ -72,7 +77,8 @@ public abstract class BaseActivity extends Activity implements ActivityContext { flag = true, value = {INVISIBLE_BY_STATE_HANDLER, INVISIBLE_BY_APP_TRANSITIONS, INVISIBLE_BY_PENDING_FLAGS, PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION}) - public @interface InvisibilityFlags{} + public @interface InvisibilityFlags { + } private final ArrayList mDPChangeListeners = new ArrayList<>(); private final ArrayList mMultiWindowModeChangedListeners = @@ -97,6 +103,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext { /** * State flag indicating if the user is active or the activity when to background as a result * of user action. + * * @see #isUserActive() */ public static final int ACTIVITY_STATE_USER_ACTIVE = 1 << 4; @@ -120,14 +127,28 @@ public abstract class BaseActivity extends Activity implements ActivityContext { ACTIVITY_STATE_WINDOW_FOCUSED, ACTIVITY_STATE_USER_ACTIVE, ACTIVITY_STATE_TRANSITION_ACTIVE}) - public @interface ActivityFlags{} + public @interface ActivityFlags { + } + + /** Returns a human-readable string for the specified {@link ActivityFlags}. */ + public static String getActivityStateString(@ActivityFlags int flags) { + StringJoiner result = new StringJoiner("|"); + appendFlag(result, flags, ACTIVITY_STATE_STARTED, "state_started"); + appendFlag(result, flags, ACTIVITY_STATE_RESUMED, "state_resumed"); + appendFlag(result, flags, ACTIVITY_STATE_DEFERRED_RESUMED, "state_deferred_resumed"); + appendFlag(result, flags, ACTIVITY_STATE_WINDOW_FOCUSED, "state_window_focused"); + appendFlag(result, flags, ACTIVITY_STATE_USER_ACTIVE, "state_user_active"); + appendFlag(result, flags, ACTIVITY_STATE_TRANSITION_ACTIVE, "state_transition_active"); + return result.toString(); + } @ActivityFlags private int mActivityFlags; // When the recents animation is running, the visibility of the Launcher is managed by the // animation - @InvisibilityFlags private int mForceInvisible; + @InvisibilityFlags + private int mForceInvisible; private final ViewCache mViewCache = new ViewCache(); @@ -284,17 +305,29 @@ public abstract class BaseActivity extends Activity implements ActivityContext { return mActivityFlags; } - protected void addActivityFlags(int flags) { - mActivityFlags |= flags; - onActivityFlagsChanged(flags); + protected void addActivityFlags(int toAdd) { + final int oldFlags = mActivityFlags; + mActivityFlags |= toAdd; + if (DEBUG) { + Log.d(TAG, "Launcher flags updated: " + formatFlagChange(mActivityFlags, oldFlags, + BaseActivity::getActivityStateString)); + } + onActivityFlagsChanged(toAdd); } - protected void removeActivityFlags(int flags) { - mActivityFlags &= ~flags; - onActivityFlagsChanged(flags); + protected void removeActivityFlags(int toRemove) { + final int oldFlags = mActivityFlags; + mActivityFlags &= ~toRemove; + if (DEBUG) { + Log.d(TAG, "Launcher flags updated: " + formatFlagChange(mActivityFlags, oldFlags, + BaseActivity::getActivityStateString)); + } + + onActivityFlagsChanged(toRemove); } - protected void onActivityFlagsChanged(int changeBits) { } + protected void onActivityFlagsChanged(int changeBits) { + } public void addMultiWindowModeChangedListener(MultiWindowModeChangedListener listener) { mMultiWindowModeChangedListeners.add(listener); @@ -307,6 +340,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext { /** * Used to set the override visibility state, used only to handle the transition home with the * recents animation. + * * @see QuickstepTransitionManager#createWallpaperOpenRunner */ public void addForceInvisibleFlag(@InvisibilityFlags int flag) { @@ -337,7 +371,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext { + getDeviceProfile().isVerticalBarLayout()); writer.println(prefix + "orientation=" + getResources().getConfiguration().orientation); writer.println(prefix + "mSystemUiController: " + mSystemUiController); - writer.println(prefix + "mActivityFlags: " + mActivityFlags); + writer.println(prefix + "mActivityFlags: " + getActivityStateString(mActivityFlags)); writer.println(prefix + "mForceInvisible: " + mForceInvisible); } diff --git a/src/com/android/launcher3/util/FlagDebugUtils.kt b/src/com/android/launcher3/util/FlagDebugUtils.kt new file mode 100644 index 0000000000..f281943496 --- /dev/null +++ b/src/com/android/launcher3/util/FlagDebugUtils.kt @@ -0,0 +1,37 @@ +package com.android.launcher3.util + +import java.util.StringJoiner +import java.util.function.IntFunction + +object FlagDebugUtils { + + /** Appends the [flagName] to [str] when the [flag] is set in [flags]. */ + @JvmStatic + fun appendFlag(str: StringJoiner, flags: Int, flag: Int, flagName: String) { + if (flags and flag != 0) { + str.add(flagName) + } + } + + /** + * Produces a human-readable representation of the [current] flags, followed by a diff from from + * [previous]. + * + * The resulting string is intented for logging and debugging. + */ + @JvmStatic + fun formatFlagChange(current: Int, previous: Int, flagSerializer: IntFunction): String { + val result = StringJoiner(" ") + result.add("[" + flagSerializer.apply(current) + "]") + val changed = current xor previous + val added = current and changed + if (added != 0) { + result.add("+[" + flagSerializer.apply(added) + "]") + } + val removed = previous and changed + if (removed != 0) { + result.add("-[" + flagSerializer.apply(removed) + "]") + } + return result.toString() + } +} From 0d22befcb8385f0fcd6bb9168d0c54268a79ae33 Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Wed, 15 Mar 2023 14:35:31 -0700 Subject: [PATCH 5/8] VisD update for the PipAppIconOverlay 2/N - Pass the up-to-dated app icon size from Launcher to WMShell this is for non-auto-enter-pip cases - For auto-enter-pip, use the DeviceProfile#allAppsIconSizePx directly Video: http://recall/-/aaaaaabFQoRHlzixHdtY/ha3ebrRk0hAEyU8GSWBrYE Bug: Bug: 271912318 Test: manual with 4x4 and 5x5 grid, see the video Change-Id: Iaad26758a25c6cb3832a2da10e15c53e72de0ce5 --- .../launcher3/uioverrides/QuickstepLauncher.java | 9 +++++++-- .../com/android/quickstep/AbsSwipeUpHandler.java | 1 + .../src/com/android/quickstep/SystemUiProxy.java | 13 +++++++++++++ .../quickstep/util/SwipePipToHomeAnimator.java | 15 ++++++++++++--- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 2a46e08abe..af76cbeb1f 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -172,7 +172,6 @@ import com.android.quickstep.views.FloatingTaskView; import com.android.quickstep.views.OverviewActionsView; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskView; -import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.unfold.RemoteUnfoldSharedComponent; import com.android.systemui.unfold.UnfoldSharedComponent; @@ -192,7 +191,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Stream; @@ -1219,11 +1217,18 @@ public class QuickstepLauncher extends Launcher { return false; } + @Override + protected void onDeviceProfileInitiated() { + super.onDeviceProfileInitiated(); + SystemUiProxy.INSTANCE.get(this).setLauncherAppIconSize(mDeviceProfile.iconSizePx); + } + @Override public void dispatchDeviceProfileChanged() { super.dispatchDeviceProfileChanged(); Trace.instantForTrack(TRACE_TAG_APP, "QuickstepLauncher#DeviceProfileChanged", getDeviceProfile().toSmallString()); + SystemUiProxy.INSTANCE.get(this).setLauncherAppIconSize(mDeviceProfile.iconSizePx); } /** diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index e9385d9fd1..753d736949 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -1602,6 +1602,7 @@ public abstract class AbsSwipeUpHandler, .setContext(mContext) .setTaskId(runningTaskTarget.taskId) .setActivityInfo(taskInfo.topActivityInfo) + .setAppIconSizePx(mDp.iconSizePx) .setLeash(runningTaskTarget.leash) .setSourceRectHint( runningTaskTarget.taskInfo.pictureInPictureParams.getSourceRectHint()) diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 7c09805dbb..b3bee6cd16 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -546,6 +546,19 @@ public class SystemUiProxy implements ISystemUiProxy { } } + /** + * Sets the app icon size in pixel used by Launcher all apps. + */ + public void setLauncherAppIconSize(int iconSizePx) { + if (mPip != null) { + try { + mPip.setLauncherAppIconSize(iconSizePx); + } catch (RemoteException e) { + Log.w(TAG, "Failed call setLauncherAppIconSize", e); + } + } + } + // // Splitscreen // diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java index dcbccc539b..e6214f6bf4 100644 --- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java +++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java @@ -94,6 +94,7 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { * @param taskId Task id associated with this animator, see also {@link #getTaskId()} * @param activityInfo {@link ActivityInfo} associated with this animator, * see also {@link #getComponentName()} + * @param appIconSizePx The size in pixel for the app icon in content overlay * @param leash {@link SurfaceControl} this animator operates on * @param sourceRectHint See the definition in {@link android.app.PictureInPictureParams} * @param appBounds Bounds of the application, sourceRectHint is based on this bounds @@ -111,6 +112,7 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { private SwipePipToHomeAnimator(@NonNull Context context, int taskId, @NonNull ActivityInfo activityInfo, + int appIconSizePx, @NonNull SurfaceControl leash, @Nullable Rect sourceRectHint, @NonNull Rect appBounds, @@ -153,7 +155,8 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { if (SystemProperties.getBoolean( "persist.wm.debug.enable_pip_app_icon_overlay", true)) { mPipContentOverlay = new PipContentOverlay.PipAppIconOverlay(view.getContext(), - mAppBounds, () -> new IconProvider(context).getIcon(mActivityInfo)); + mAppBounds, new IconProvider(context).getIcon(mActivityInfo), + appIconSizePx); } else { mPipContentOverlay = new PipContentOverlay.PipColorOverlay(view.getContext()); } @@ -317,6 +320,7 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { private Context mContext; private int mTaskId; private ActivityInfo mActivityInfo; + private int mAppIconSizePx; private SurfaceControl mLeash; private Rect mSourceRectHint; private Rect mDisplayCutoutInsets; @@ -345,6 +349,11 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { return this; } + public Builder setAppIconSizePx(int appIconSizePx) { + mAppIconSizePx = appIconSizePx; + return this; + } + public Builder setLeash(SurfaceControl leash) { mLeash = leash; return this; @@ -425,8 +434,8 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { mAppBounds.inset(mDisplayCutoutInsets); } } - return new SwipePipToHomeAnimator(mContext, mTaskId, mActivityInfo, mLeash, - mSourceRectHint, mAppBounds, + return new SwipePipToHomeAnimator(mContext, mTaskId, mActivityInfo, mAppIconSizePx, + mLeash, mSourceRectHint, mAppBounds, mHomeToWindowPositionMap, mStartBounds, mDestinationBounds, mFromRotation, mDestinationBoundsTransformed, mCornerRadius, mShadowRadius, mAttachedView); From 6adae751e76e6467f5c1101e154e76ef903849c2 Mon Sep 17 00:00:00 2001 From: Ats Jenk Date: Thu, 16 Mar 2023 09:26:10 -0700 Subject: [PATCH 6/8] Make sure desktop task view is only used in proto 2 When swiping up to recents and creating the current tasks TaskView, we were checking for proto 1 or proto 2 to be enabled. And if they were, we were creating the DesktopTaskView object. The DesktopTaskView should only be enabled in proto 2. Updated the feature flag check. Bug: 273950066 Test: enable proto 1 and gesture nav, have a desktop app open, swipe up to recents, no desktop tile Test: enable proto 2 and gesture nav, have a desktop app open, swipe up to recents, see the desktop tile Change-Id: I73a47347d60e0f57ad6cf6e363a6fe83ac8cc509 --- quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 4ba02769a5..af42affdce 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -2614,7 +2614,7 @@ public abstract class RecentsView Date: Mon, 13 Mar 2023 17:20:32 -0400 Subject: [PATCH 7/8] Fixes tests and issues when toggling new app shortcut popup flag. Bug: 247880037 Test: manually tested app popup. Also ran Launcher tests locally with U flag on/off. Change-Id: I93c04f9715d583376c36d823c23353619afd26b6 --- .../system_shortcut_icons_container.xml | 2 +- ...em_shortcut_icons_container_material_u.xml | 2 +- res/layout/system_shortcut_rows_container.xml | 1 - ...tem_shortcut_rows_container_material_u.xml | 25 +++++++++++++++++++ .../popup/PopupContainerWithArrow.java | 9 ++++--- 5 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 res/layout/system_shortcut_rows_container_material_u.xml diff --git a/res/layout/system_shortcut_icons_container.xml b/res/layout/system_shortcut_icons_container.xml index dc4fdb3832..fa92ba3d01 100644 --- a/res/layout/system_shortcut_icons_container.xml +++ b/res/layout/system_shortcut_icons_container.xml @@ -16,7 +16,7 @@ + + + diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 43ca2a6efb..9f290f7b51 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -327,11 +327,14 @@ public class PopupContainerWithArrow initializeSystemShortcuts(systemShortcuts); } else { mDeepShortcutContainer.setVisibility(View.GONE); + mSystemShortcutContainer = inflateAndAdd(R.layout.system_shortcut_rows_container, + this, 0); + mWidgetContainer = mSystemShortcutContainer; if (!shortcuts.isEmpty()) { for (int i = 0; i < shortcuts.size(); i++) { initializeSystemShortcut( R.layout.system_shortcut, - this, + mSystemShortcutContainer, shortcuts.get(i), i < shortcuts.size() - 1); } @@ -358,7 +361,7 @@ public class PopupContainerWithArrow addAllShortcutsMaterialU(deepShortcutCount, systemShortcuts); } else if (!systemShortcuts.isEmpty()) { addSystemShortcutsMaterialU(systemShortcuts, - R.layout.system_shortcut_rows_container, + R.layout.system_shortcut_rows_container_material_u, R.layout.system_shortcut); } show(); @@ -395,7 +398,7 @@ public class PopupContainerWithArrow if (deepShortcutCount + systemShortcuts.size() <= SHORTCUT_COLLAPSE_THRESHOLD) { // add all system shortcuts including widgets shortcut to same container addSystemShortcutsMaterialU(systemShortcuts, - R.layout.system_shortcut_rows_container, + R.layout.system_shortcut_rows_container_material_u, R.layout.system_shortcut); addDeepShortcutsMaterialU(deepShortcutCount); return; From a5ead45967f204fd938846d0d2fa3fa244857708 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 16 Mar 2023 12:47:16 -0700 Subject: [PATCH 8/8] Simplifying some page indicator dots attributes so that it can be easily modularized > Moving the color configuration to xml > Moving auto-hide logic to a subclass as it doesn't need to be in the main library Bug: 274011949 Test: Verified on device Change-Id: Icf7bd5d1cbde3daa9441f2af51f98a931bcd6ee2 --- quickstep/res/layout/taskbar_edu.xml | 3 +- .../taskbar/TaskbarEduPagedView.java | 4 +- res/drawable/page_indicator.xml | 6 - res/layout/page_indicator_dots.xml | 8 +- res/layout/user_folder_icon_normalized.xml | 3 +- res/values-night-v31/colors.xml | 2 + res/values-night/colors.xml | 2 + res/values-v31/colors.xml | 3 +- res/values/attrs.xml | 7 +- res/values/colors.xml | 3 +- res/values/styles.xml | 2 - src/com/android/launcher3/Launcher.java | 5 - .../WorkspaceStateTransitionAnimation.java | 4 +- .../launcher3/folder/FolderPagedView.java | 4 +- .../LauncherDotsPageIndicator.java | 197 ++++++++++++++++++ .../pageindicators/PageIndicator.java | 11 +- .../pageindicators/PageIndicatorDots.java | 167 ++------------- 17 files changed, 255 insertions(+), 176 deletions(-) delete mode 100644 res/drawable/page_indicator.xml create mode 100644 src/com/android/launcher3/pageindicators/LauncherDotsPageIndicator.java diff --git a/quickstep/res/layout/taskbar_edu.xml b/quickstep/res/layout/taskbar_edu.xml index d7daea31cd..f3856ba69e 100644 --- a/quickstep/res/layout/taskbar_edu.xml +++ b/quickstep/res/layout/taskbar_edu.xml @@ -55,7 +55,7 @@ style="@style/TaskbarEdu.Button.Close" android:textColor="?android:attr/textColorPrimary"/> -