summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-26Keep the tertiary button align be the same as bc style(central_horizontal).android13-devHank Sheng
before: Glif v3 with partner resource: https://hsv.googleplex.com/6252537339445248 Glif v4 without partner resource: https://hsv.googleplex.com/6441325713948672 after: Glif v3 with partner resource: https://hsv.googleplex.com/4663788268683264 Glif v4 without partner resource: https://hsv.googleplex.com/5841028939513856 Change on g3 setupdesign library: cl/450891379 Bug: 233036258 Bug: 233032365 Change-Id: Ieaa9dcd168d0b52866ced42585986f1b33d611e0
2022-05-23Import updated Android Setupdesign Library 448864925Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Included changes: - 448864925 Fix the alert dialog. - 446430090 The layoutparams is provided by the parent of the view. - 445294496 Add the targetAPI check for the attribute autofilledHighl... PiperOrigin-RevId: 448864925 Change-Id: I8a1a95ae87a0893245bc5c2c338b94c8e68f2139
2022-04-28Import updated Android Setupdesign Library 444422216Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Bug: 230266991 Included changes: - 444422216 Set partner configs to dimension name of design library - 442786567 Create a theme that make the autofilled background to fit... - 441912580 Update icon and container colors for Tortal modules accor... - 441138276 Only set margin on the content area, and other set the pa... - 440813206 Set partner configs to dimension name instead of numerica... - 440811223 Fix the margin start error when partner config margin les... - 440035323 Not using a constructed instance will soon be a compile e... - 438705462 Add the targetAPI check for the attribute fontFamily PiperOrigin-RevId: 444422216 Change-Id: I451fee54f44cdd4d957bcb7d248b208263e94746
2022-03-31Import updated Android Setupdesign Library 438331250Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Bug: 225800660 Included changes: - 438331250 Use the dynamic color theme which is not depend on glif t... - 438250648 Apply the glif v4 style on the list item description layo... - 438237741 Update the list item verbose style. - 438229858 Update the list item switch style and correct the font fa... - 437961224 Automated g4 rollback of changelist 437849321. - 437849321 Automated g4 rollback of changelist 437438413. - 437438413 Automated g4 rollback of changelist 436450355. - 436450355 Automated g4 rollback of changelist 436406248. - 436406248 Update Glifv4 default value for button. PiperOrigin-RevId: 438331250 Change-Id: Ief5e41fda89e546388e56c5c788dde45171f018a
2022-03-22Import updated Android Setupdesign Library 436370329Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Bug: 224400917 Bug: 218793525 Included changes: - 436370329 Support colorSurface - 435297888 Correct the margin start. - 435242662 Automated g4 rollback of changelist 434627664. - 434989715 Fix the ratio division. - 434932870 Move the new color scheme to v33 to avoid color different... - 434627664 Change SudItemContainer.Description.Glif padding to align... - 434407141 Automated g4 rollback of changelist 390404031. - 433734045 [SetupDesign] update default value for Glifv4 - Footer ba... - 433651694 Automated g4 rollback of changelist 431614278. PiperOrigin-RevId: 436370329 Change-Id: I917b3f173800e22fbb5944aa97e5c27baa8bd474
2022-03-09Import updated Android Setupdesign Library 432397943Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Included changes: - 432397943 Edge to Edge, eliminate the navigation bar divider. - 432341362 Make the loadinglayout header height match parent in land... - 432061547 Fix the wrong padding top on landscape loading screen - 431614278 Updates the new color scheme - 430955940 Rollin the header section support again(cl/430632447) and... - 430906695 Automated g4 rollback of changelist 430632447. - 430646242 Fix card view fit layout in fullscreen mode - 430632447 [SetupDesign] update default value for Glifv4 - header se... - 429495738 migrate some material style to Glifv4 theme. - 428987926 Update the edit box corner radius. - 428716981 Add a partnerconfig for loading animation finished. - 428618706 Cloned CL/423965608 - 428389234 Update targetSdkVersion to 32 of unit tests - 423478198 Add the sudDividerShown in recycler mixin. - 422744910 [Tablet] Add default values of GlifLayout into setupdesig... - 422734768 Add target api check for android attribute. PiperOrigin-RevId: 432397943 Change-Id: I700a6b49ac4f2830833dc8f7364beb9f72c3b4a0
2022-03-09[automerger skipped] Merge Android 12L am: 421d783b26 -s ours am: 2aa9351a0e ↵Xin Li
-s ours am: 52b61fb858 -s ours am skip reason: Merged-In Icfc14be2b731e4958e090bb935807ee414076b7f with SHA-1 6a54988343 is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2013254 Change-Id: I8afd9a1883cdc7a1513a51054cfb7a9d5c75938b
2022-03-08[automerger skipped] Merge Android 12L am: 421d783b26 -s ours am: 2aa9351a0e ↵Xin Li
-s ours am skip reason: Merged-In Icfc14be2b731e4958e090bb935807ee414076b7f with SHA-1 6a54988343 is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2013254 Change-Id: I0aaedd8032d383d0bd83fdcc18573b11589ee45e
2022-03-08[automerger skipped] Merge Android 12L am: 421d783b26 -s oursXin Li
am skip reason: Merged-In Icfc14be2b731e4958e090bb935807ee414076b7f with SHA-1 6a54988343 is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/2013254 Change-Id: Ib0d2766d8dea2aa7f1f120a8a7d7a5449bd06a22
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: Icfc14be2b731e4958e090bb935807ee414076b7f Change-Id: I7492db7540dbffabe534f168cea8f50433bb36e6
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
6a54988343 -s ours am: 28770ab49b -s ours am skip reason: Merged-In I2017c021e6baf200ad718eb661010eba56cdf39d with SHA-1 f8c3b3f5d8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16845169 Change-Id: Ieb131519866eea2e30a912af541018d6b81a7f46
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
6a54988343 -s ours am skip reason: Merged-In I2017c021e6baf200ad718eb661010eba56cdf39d with SHA-1 f8c3b3f5d8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16845169 Change-Id: I35b1f38497b042d407ff95463f95056809a7d28d
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: I2017c021e6baf200ad718eb661010eba56cdf39d Change-Id: Icfc14be2b731e4958e090bb935807ee414076b7f
2022-01-31Update OWNERS file for external/setupdesignMaurice Lam
Change-Id: I73adc3e42455cbf92ca8f88bafe107a7cdf1a86d
2022-01-19Import updated Android Setupdesign Library 422272789Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Included changes: - 422272789 Fixed the wrong attribute for default footer bar padding ... - 421746593 [SetupDesign] Support EditBox dynamic color for new dynam... - 421699365 [Transition] Migrates interpolator config file from anim-... - 421586845 Add List Item Material Next Style. - 421573482 Fix the Edit box theme. - 421555926 [SetupDesing] Prepare the new DynamicColor theme without ... - 421548320 [SetupDesing] Fix the loading circle too large issue - 421491041 Fix alert dialog title text size to match GM3 guideline. - 421479952 Add edit box theme. - 421459352 Add attribute of list item divider shown. - 421431651 Automated g4 rollback of changelist 417941860. - 420060995 [SetupCompat] Add helper to read the MY style flag from s... - 419874242 Migrate android.support.annotation. to androidx.annotation. - 418572016 [SetupDesign] Add GlifV4 theme - 417941860 Automated g4 rollback of changelist 416459854. - 416459854 [Tablet] Set default top margin value into setupdesign li... Bug:213303604 PiperOrigin-RevId: 422272789 Change-Id: Idad4c466281927679f3e27449e92105623bcbe41
2021-12-08Import updated Android Setupdesign Library 412352628 am: f8c3b3f5d8 am: ↵Setup Wizard Team
42cf94b997 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16413599 Change-Id: Ie22046f6df5e2c98f3849ebb65fcd1d2adb693b2
2021-12-08Import updated Android Setupdesign Library 412352628 am: f8c3b3f5d8Setup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16413599 Change-Id: I7832ca6379cdbf9f2aeff93cbbd820006c0ac3a8
2021-12-07Import updated Android Setupdesign Library 412352628android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseSetup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Included changes: - 412352628 [SetupDesign] update targetApi number for android:textDir... - 412250860 Add partner config for the middle space of 2-column layou... Bug: 205781866 PiperOrigin-RevId: 412352628 Change-Id: I2017c021e6baf200ad718eb661010eba56cdf39d
2021-11-26Import updated Android Setupdesign Library 412158963 am: da45aaa7e6 am: ↵Setup Wizard Team
d1f960f889 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16339912 Change-Id: I2ff3489049153fa76bd0f2d46b51f5a920a869d0
2021-11-26Import updated Android Setupdesign Library 412158963 am: da45aaa7e6Setup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16339912 Change-Id: Ia79140ce5fcc1ebd61aba700681ef8a83c2a1fcd
2021-11-25Import updated Android Setupdesign Library 412158963Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Included changes: - 412158963 Hide item divider in google service when system property ... - 412135443 Migrate compat classes to androidx - 411941072 [SetupDesing] To add android:importantForAccessibility="n... - 411938410 Support Item class config contentDescription for accessib... - 411691396 Add the attribute accessibilityHeading in header title - 411539431 [SetupDesing] Fix the keypad default focus issue in lands... - 411518305 [Stencil] Adds BC transition for RTL style on S. - 410938656 [Stencil] Makes HeaderMixin and DescriptionMixin supports... - 410189919 Fix sample app truncated in sw800 when partner config off PiperOrigin-RevId: 412158963 Bug: 207099076 Change-Id: I094efbeaceada9a3a5b94018cf8e8ed8909d8e30
2021-11-11Import updated Android Setupdesign Library 408233292 am: 860cce2416 am: ↵Setup Wizard Team
e82a803759 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16214455 Change-Id: I7234375e5120a57d2c67b362bb434f6741cb4efb
2021-11-11Import updated Android Setupdesign Library 408233292 am: 860cce2416Setup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16214455 Change-Id: I990f773c9128b76555d461c90f42084702878889
2021-11-09Import updated Android Setupdesign Library 408233292Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Bug: 205134345 Test: mm Included changes: - 408233292 Automated g4 rollback of changelist 407821022. - 407821022 [SetupDesign] Follow SUW OEM guideline update the default... - 407758043 [SetupDesign] Fix the GlifLoadingLayout content area trun... - 407292165 Fix the content show in card layout be truncated in two p... - 406832607 Automated g4 rollback of changelist 405880437. PiperOrigin-RevId: 408233292 Change-Id: Id71919a5a133b040e7e30f2b511a94ed763de13f
2021-11-04Import updated Android Setupdesign Library 406038565 am: 341b27d037 am: ↵Setup Wizard Team
2189580a41 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16138379 Change-Id: I8d809dcf9cb7152dc73c7b7e620471d5ce96ab25
2021-11-04Import updated Android Setupdesign Library 406038565 am: 341b27d037Setup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16138379 Change-Id: I011d7271f2669b14a04122db26126fddd7992aad
2021-10-28Import updated Android Setupdesign Library 406038565Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Bug: 202802836 Bug: 405583789 Test: mm Included changes: - 406038565 [Tablet] Make start/end/top margin of content customized ... - 405880437 [Tablet] Default enable full screen in android S and abov... - 405818499 Add protection for stuck in loading layout. - 405808042 Enable android lint as a part of TAP CL/404618483 - 405583789 Remove extended_partner_config_enabled check - 405535718 [Tablet] Make header and description style customized on ... - 404688622 [Tablet] Customize start/end margin of partner configs on... - 404457168 [Tablet] Make icon style customized on light theme PiperOrigin-RevId: 406038565 Change-Id: I9753e3cb75b0d92ce0b42625daf56e9f73908122
2021-10-21Import updated Android Setupdesign Library 403382319 am: ebc363d773 am: ↵Setup Wizard Team
c9623ec76a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16084493 Change-Id: I9d80cf8450b4ffe2deef1819328498a04f97340a
2021-10-21Import updated Android Setupdesign Library 403382319 am: ebc363d773Setup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/16084493 Change-Id: I65858352fb2ada7b31de0feb335f6be49b79d624
2021-10-19Import updated Android Setupdesign Library 403382319Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Included changes: - 403382319 [SetupDesign] Support fullscreen loading animation - 403275958 Add logger for lottie animation. - 402853646 [GlifLoadingLayout] add listener before making animation ... - 402728163 Adjust icon size and margin top when using long logo icon - 401677350 Remove support adjust duration lottie type of GlifLoading... - 400971379 [Foldable] BC margin style should be applied when setting... Bug: 197289170 PiperOrigin-RevId: 403382319 Change-Id: I64ab54ccabf0f5fe44d3dfd0c5382f13c98d4459
2021-10-08[automerger skipped] Merge Android 12 am: 1bdd18355e -s ours am: 51d86f2726 ↵Xin Li
-s ours am: ba05aa6300 -s ours am: 6fe04f3653 -s ours am: 5b3348af24 -s ours am skip reason: Merged-In I38da9f192d57688b1b05bb2bf41ce33f87a60807 with SHA-1 e595fd650a is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/1847439 Change-Id: Ifa197c24a9191e5541994b522af3d2939f4b0d01
2021-10-08[automerger skipped] Merge Android 12 am: 1bdd18355e -s ours am: 51d86f2726 ↵Xin Li
-s ours am: ba05aa6300 -s ours am: 6fe04f3653 -s ours am skip reason: Merged-In I38da9f192d57688b1b05bb2bf41ce33f87a60807 with SHA-1 e595fd650a is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/1847439 Change-Id: Ie09965dea93c0946fa9d1318b0ec9e0dc9bdbbb0
2021-10-08[automerger skipped] Merge Android 12 am: 1bdd18355e -s ours am: 51d86f2726 ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
-s ours am: ba05aa6300 -s ours am skip reason: Merged-In I38da9f192d57688b1b05bb2bf41ce33f87a60807 with SHA-1 e595fd650a is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/1847439 Change-Id: I51b50fad68d07273d406e83c178c4e6e340e54e4
2021-10-08[automerger skipped] Merge Android 12 am: 1bdd18355e -s ours am: 51d86f2726 ↵Xin Li
-s ours am skip reason: Merged-In I38da9f192d57688b1b05bb2bf41ce33f87a60807 with SHA-1 e595fd650a is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/1847439 Change-Id: Icc1e422b3ad9658d06511be5f5aa3965c4844cbe
2021-10-08[automerger skipped] Merge Android 12 am: 1bdd18355e -s oursXin Li
am skip reason: Merged-In I38da9f192d57688b1b05bb2bf41ce33f87a60807 with SHA-1 e595fd650a is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/1847439 Change-Id: I6bcbea3653d0f6430625a172dc30635b0a4ebc70
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I38da9f192d57688b1b05bb2bf41ce33f87a60807 Change-Id: I0d6f006a77e78f9bf1b08847b434d224208b6763
2021-09-30Import updated Android Setupdesign Library 399844407 am: b665e5f819 am: ↵Setup Wizard Team
e10fb88c82 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/15948463 Change-Id: I0852518a9e298f37d3dd035fb385be9881ea275a
2021-09-30Import updated Android Setupdesign Library 399844407 am: b665e5f819Setup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/15948463 Change-Id: I220256576f42a2340f0173413f513ac7e88ffbe2
2021-09-30Import updated Android Setupdesign Library 399844407Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Bug: 200248171 Included changes: - 399844407 Automated g4 rollback of changelist 397224761. - 399844364 Automated g4 rollback of changelist 398671729. - 399827862 Update the content top margin for GlifPreferenceLayout la... - 398671729 Fix oobe e2e test failed because SUW crash when ProgressA... PiperOrigin-RevId: 399844407 Change-Id: I5390417177bb81b0a95522317defc5bc4ec8967f
2021-09-27Import updated Android Setupdesign Library 398203590 am: 842dff4bdf am: ↵Setup Wizard Team
f8340a56cb Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/15899314 Change-Id: I79b5527401cb6597926b5c44d45bf5cd66b1a250
2021-09-27Import updated Android Setupdesign Library 398203590 am: 842dff4bdfSetup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/15899314 Change-Id: Ideb8403fd5f06d260c8443adffaae64162a3fbf2
2021-09-24Import updated Android Setupdesign Library 398203590Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Included changes: - 398203590 [SetupDesign] Dynamic color - update linked text color - 397224761 [GlifLoadingLayout] Fix stuck because unexpected animatio... - 397056960 [SetupDesign] Correct the color mapping for NV - 397010084 [SetupDesign] Update the switch on/off color make sure it... - 396747614 [Foldable] Set default typeface in variety of textAppeara... - 396738782 [Foldable] Apply default font family to appcompat dialog ... - 395896459 Automated g4 rollback of changelist 395427354. - 395433307 [Foldable] Apply default font family to appcompat dialog ... - 395427354 [GlifLoadingLayout] Add maximum time to wait animation fi... - 395094760 [Foldable] Apply default font family to dialog button. - 395053506 Automated g4 rollback of changelist 394597013. - 394597013 [GlifLoadingLayout] Add maximum time to wait animation fi... - 394182476 Automated g4 rollback of changelist 394160078. - 394160078 [Foldable] Apply default font family to dialog button. - 392854455 [Foldable] Set device default style for textView and for ... - 392570490 Update the targetSdkVersion of both setup compat and setu... - 391939054 [SetupDesign] Fix the the GlifLayout shift after reset Co... - 391901589 Migrate android.support.annotation.NonNull to androidx. Bug: 200764013 PiperOrigin-RevId: 398203590 Change-Id: Ib76d8fb623146633cb591013faed0151a5366444
2021-08-19Import updated Android Setupdesign Library 390949856 am: 898ed76ec2 am: ↵Setup Wizard Team
1f82a158a8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/15604007 Change-Id: I9a927c5732690a4173bb16f1108a3604afb0e059
2021-08-19Import updated Android Setupdesign Library 390949856 am: 898ed76ec2Setup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/15604007 Change-Id: Ib84f016477daeed2df6e0a2497a2929a4e0ef7ef
2021-08-18Import updated Android Setupdesign Library 390949856Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Included changes: - 390949856 Fix link span not apply partner config Bug: 193190824 PiperOrigin-RevId: 390949856 Change-Id: Ida6370f1a42c72e1768d29a4deb4272a6ce07487
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e595fd650a -s ours am: 2ffab078e5 -s ours am: 481321b650 -s ours am: fc8baa3904 -s ours am skip reason: Merged-In I1ab0e42437ef8c2acdf7e93863c21197b4731e5f with SHA-1 a364928354 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/15571776 Change-Id: I4d9c5de328bf6cc00270bd3df6c7946dadf5d9d3
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e595fd650a -s ours am: 2ffab078e5 -s ours am: 481321b650 -s ours am skip reason: Merged-In I1ab0e42437ef8c2acdf7e93863c21197b4731e5f with SHA-1 a364928354 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/15571776 Change-Id: Ic934cb2a0d5adb028e7c29428a4e970cb8c2711c
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e595fd650a -s ours am: 2ffab078e5 -s ours am skip reason: Merged-In I1ab0e42437ef8c2acdf7e93863c21197b4731e5f with SHA-1 a364928354 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/15571776 Change-Id: I9fb7f69fe157b477c8cd3b70b2ecb60c0617c9b7
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e595fd650a -s ours am skip reason: Merged-In I1ab0e42437ef8c2acdf7e93863c21197b4731e5f with SHA-1 a364928354 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/15571776 Change-Id: I6fb5e704cf194c5429e762ff6099fcbf4b404fe4
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I1ab0e42437ef8c2acdf7e93863c21197b4731e5f Change-Id: I38da9f192d57688b1b05bb2bf41ce33f87a60807
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 05:42:12 +0000