summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-08[automerger skipped] Merge Android 12 am: 961085a273 -s ours am: 3b59093a0a ↵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: d843abb770 -s ours am skip reason: Merged-In I40ce7b1692e93617aec9de7a0d3a8b154fdf7a02 with SHA-1 27fa29e45b is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1847596 Change-Id: I33eeff07f0dbedf8997dbb38dbf236564eab47a8
2021-10-08[automerger skipped] Merge Android 12 am: 961085a273 -s ours am: 3b59093a0a ↵Xin Li
-s ours am skip reason: Merged-In I40ce7b1692e93617aec9de7a0d3a8b154fdf7a02 with SHA-1 27fa29e45b is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1847596 Change-Id: I78bc888c7d0a21fbb68d135732c08f900e8f1c83
2021-10-08[automerger skipped] Merge Android 12 am: 961085a273 -s oursXin Li
am skip reason: Merged-In I40ce7b1692e93617aec9de7a0d3a8b154fdf7a02 with SHA-1 27fa29e45b is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1847596 Change-Id: Ic612d1b754dca1ce9316d6e0d50a7d27ff4c75a2
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: I40ce7b1692e93617aec9de7a0d3a8b154fdf7a02 Change-Id: I05e2d68620fce1386d3e681a7f28df1cb8da0e96
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
27fa29e45b -s ours am: 7651ae5023 -s ours am skip reason: Merged-In Ia1aa63b7495a82d72da0ca5a70e1bda473cedc91 with SHA-1 f0a54b2317 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/15571749 Change-Id: Ie074a69ae36f00591be2c8d8fccb3c47b33567fa
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
27fa29e45b -s ours am skip reason: Merged-In Ia1aa63b7495a82d72da0ca5a70e1bda473cedc91 with SHA-1 f0a54b2317 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/15571749 Change-Id: I039ce831211cc9135618447ce7158e7b60bdc1f8
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: Ia1aa63b7495a82d72da0ca5a70e1bda473cedc91 Change-Id: I40ce7b1692e93617aec9de7a0d3a8b154fdf7a02
2021-06-16Import updated Android SetupCompat Library 379335714 am: cdc282e9efSetup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/14963615 Change-Id: Ia1aa63b7495a82d72da0ca5a70e1bda473cedc91
2021-06-16Import updated Android SetupCompat Library 379335714android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devSetup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 190794282 Included changes: - 379335714 Update Android Lint to google3 http://ab/7296657 - 378871011 [tablet] Add partner configs to set width/height of card ... PiperOrigin-RevId: 379335714 Change-Id: I4c10971938bc3d0a2e63115e62e50e63fe9275e2
2021-06-10Import updated Android SetupCompat Library 378593677 am: f513dd2bf8Setup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/14911833 Change-Id: I9ae985a36a460b67feacd0334698da58d92549ea
2021-06-10Import updated Android SetupCompat Library 378593677Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 190562325 Included changes: - 378593677 [SetupDesign] Dynamic primary button - fix the primary bu... - 378572218 Rollback P100 color - 378372241 Add missed log in setupcompat - 378097631 [DynamicColor] Moves the function that apply dynamic colo... - 377838411 Consolidate log tag of setupdesign and setupcompat library - 377415349 Apply dynamic color P100 on a primary-style secondary but... PiperOrigin-RevId: 378593677 Change-Id: I7384eaccb01cb95199ad281abb476e5c7c2f4ca4
2021-06-03Import updated Android SetupCompat Library 377091999 am: ab6e0fff53Setup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/14809393 Change-Id: Icec448b402a83ba9d13fd87527d6aa40fbcef2e4
2021-06-03Import updated Android SetupCompat Library 377091999Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 189741363 Included changes: - 377091999 [BC SUW] Apply primary button style to the "Start Recordi... - 376995553 Apply dynamic color P100 on footer button background - 376600294 [DynamicColor] Fix when enabling button, the text color c... PiperOrigin-RevId: 377091999 Change-Id: I8d20ff3cecfd1306e553d5bc4e04f86dc6e8d482
2021-05-25Import updated Android SetupCompat Library 375009299 am: e42bc8b1afSetup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/14688522 Change-Id: I786bd3ea1604632878f22e524ac96ee24979ad37
2021-05-24Import updated Android SetupCompat Library 375009299Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Bug: 375398336 Test: mm Included changes: - 375009299 [Setupcompat][SetupDesign] provide footer button styler [... PiperOrigin-RevId: 375009299 Change-Id: I48379b00c149d4ab588802d5b56edb5c031b0514
2021-05-12Import updated Android SetupCompat Library 373282927 am: 6a89234f6cSetup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/14513727 Change-Id: Iae40abeeddb36a0800085ae0e5fa139e3b2a9a99
2021-05-12Import updated Android SetupCompat Library 373282927Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Bug: 187652105 Test: mm Included changes: - 373282927 Avoid mixin's color override by partner config - 373109877 [SetupDesign][SetupCompat] provide footer button styler [... PiperOrigin-RevId: 373282927 Change-Id: I16a995de491b4642a517bdcdb6d227d1ad12fc20
2021-05-11Import updated Android SetupCompat Library 372106188 am: d77ab242a3Setup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/14320431 Change-Id: I8930fe6de2487e0bbc0e67b701a0eaa6fad92e3d
2021-05-11Import updated Android SetupCompat Library 372106188Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 185574209 Included changes: - 372106188 [GlifLoadingLayout] Add header height partner resources f... - 372076516 Make the left padding equal to the right one for a second... - 372059173 Allow to create a secondary button in a primary style. PiperOrigin-RevId: 372106188 Change-Id: If8c74d33ccdd4ca4e3c3dbb89134261ebdea77a5
2021-05-04Import updated Android SetupCompat Library 371667272 am: 3a3ac684efSetup Wizard Team
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/14421158 Change-Id: I1d9b0ed2b99ede6d16b20c23cc1fa146ea4a47d2
2021-05-04Import updated Android SetupCompat Library 371667272Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 182870319 Bug: 185557130 Included changes: - 371667272 Add API for ChimeraActivity - 371663526 Migrate android.support.annotation.IntDef to androidx.ann... - 371648106 [GlifLoadingLayout] Add padding partner resources for con... - 371036375 [Portal] Set default reregister timeout as 0, and will be... - 370823989 [Portal] Add field, timeout for wait client reregister, ... PiperOrigin-RevId: 371667272 Change-Id: Id108a8f6d337597cc1802686492ba57ddb0d33cb
2021-04-26Import updated Android SetupCompat Library 370375132Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 186197285 Included changes: - 370375132 Make FooterBarMixin support dynamic color by avoid overri... - 369813370 Automated g4 rollback of changelist 368202592. PiperOrigin-RevId: 370375132 Change-Id: Ia32dc3116cbb3305e7ad397f10c9ef314a1335e5
2021-04-23Revert "Import updated Android SetupCompat Library 369420590"Cn Chen
Revert "Import updated Android Setupdesign Library 369470918" Revert submission 14260711-stencil_sync_0421 Reason for revert: Stuck at Gesture Nav Reverted Changes: Ia86c5f9b7:Import updated Android Setupdesign Library 3694709... I8ce1763c6:Import updated Android SetupCompat Library 3694205... Bug: 186164923 Change-Id: I145a56ebcdf301184b55c7c878ce04bcea3fe8dd
2021-04-22Import updated Android SetupCompat Library 369420590Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 185557130 Included changes: - 369420590 [SetupWizard][AnythingElse] Adds intent extras to make 1P... - 369348844 [Portal] Checking deferred available before change to por... - 368765515 Move BuildCompatUtils to setupcompat library - 368568389 Add PROGRESS_REQUEST_REMOVED for client to request added ... - 368202592 Make FooterBarMixin support dynamic color(inside setup fl... - 368155363 Support SetTextLocale and setLayoutDirection in SetupCompat - 367973603 [BC][Stencil] Created ContentInfoStyler for applying styl... - 367259726 Migrate annotation classes to androidx - 366165064 Add new theme for dynamic color - 365976791 [GlifLoadingLayout] Add new illustration type final hold. - 365761892 [Portal] New interface for GmsCore to remove task. - 364981721 [Portal] Disable auto rebind. PiperOrigin-RevId: 369420590 Change-Id: I8ce1763c6a9e42c1b8a942ab495a81e510d81cde
2021-04-15[automerger skipped] Add lint baseline to address NewApi errors am: ↵Pedro Loureiro
71f3b1924f am: c0d3058b8c am: ed0da29ec4 -s ours am skip reason: skip tag Change-Id I21d7d6d9794b94083a4f4f33a3c65c2c6b0488a7 with SHA-1 b029e75df7 is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1675512 Change-Id: I839006323b40811fd49ca7a9d194958d189701ba
2021-04-15Add lint baseline to address NewApi errors am: 71f3b1924f am: c0d3058b8cPedro Loureiro
Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1675512 Change-Id: I56f2a4a70343d9149120882b108a6a52dc14818f
2021-04-15Add lint baseline to address NewApi errors am: 71f3b1924fandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Pedro Loureiro
Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1675512 Change-Id: Icfc078627e7f3aca74bf05223907ee8cd9c679bc
2021-04-14Add lint baseline to address NewApi errorsandroid-s-beta-2android-s-beta-1Pedro Loureiro
We are enabling a new lint check where the min sdk != compile sdk. It has produced a lot of errors and adding the baseline file(s) allows us to continue work without introducing more problems. Bug: 150847901 Test: m lint-check Change-Id: I21d7d6d9794b94083a4f4f33a3c65c2c6b0488a7 Merged-In: I21d7d6d9794b94083a4f4f33a3c65c2c6b0488a7
2021-04-12Add lint baseline to address NewApi errorsPedro Loureiro
We are enabling a new lint check where the min sdk != compile sdk. It has produced a lot of errors and adding the baseline file(s) allows us to continue work without introducing more problems. Bug: 150847901 Test: m lint-check Change-Id: I21d7d6d9794b94083a4f4f33a3c65c2c6b0488a7
2021-03-24Import updated Android SetupCompat Library 364237380Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 183584598 Included changes: - 364237380 Add specific extra for portal so activities can distingui... PiperOrigin-RevId: 364237380 Change-Id: I33f4b3494d84e27296f9da67e8226b26a984783f
2021-03-19Import updated Android SetupCompat Library 363649179Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 183082314, 181763355 Included changes: - 363649179 Add color extraction enable/disable flag - 363597787 Change the font family to Google Sans Text and footer but... PiperOrigin-RevId: 363649179 Change-Id: I189828f42dc4d932e2e0654b371e453870bf173e
2021-03-15Import updated Android SetupCompat Library 362261179Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 182136477 Included changes: - 362261179 Update the height of footer bar and footer button in land... - 361499610 [GlifLoadingLayout] Add light theme customization, we sho... - 361470484 Judge ui mode is night from activity resource instead of ... PiperOrigin-RevId: 362261179 Change-Id: Ic5b43b8a840cceb6d28586314f7f7a44371eb6db
2021-03-04Import updated Android SetupCompat Library 360792876Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 181818312 Included changes: - 360792876 [SetupCompat][Transition] Adjusts the variable applyExten... - 359412763 Automated g4 rollback of changelist 359223857. - 359258205 Support Android Studio Preview. - 359223857 Automated g4 rollback of changelist 359174100. - 359174100 Force reload partner configs when configuration changed - 358971575 [BC][Stencil] Remove divider for BC layout - 358757472 [SetupCompat] Support footer buttons text style config PiperOrigin-RevId: 360792876 Change-Id: Idbea20be00bcbc8a8247530b1d8c704bd3ecacfc
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: b84a3a9cad -s ↵Xin Li
ours am: b51a23f01e -s ours am skip reason: Change-Id Ic3506bf358e72885ddf8e5be55d7309220589e37 with SHA-1 fbf5ec69c5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2de3ce048d1e292b219dfd40fc1e81d704b01b6a
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to external/setupcompat am: 5798a4d385 am: ↵Bob Badour
00abb9f0da am: f2bb617e93 Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1587904 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica316176cf42efc8eb4b731cf28500de8c5923a4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: b84a3a9cad -s oursXin Li
am skip reason: Change-Id Ic3506bf358e72885ddf8e5be55d7309220589e37 with SHA-1 fbf5ec69c5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I258b8a3abd26b5d5ba720b18db9575e81213f4e8
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ic3506bf358e72885ddf8e5be55d7309220589e37 Change-Id: I06695f6f936035c84706cc77759b4229fbf45dcb
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to external/setupcompat am: 5798a4d385 am: ↵Bob Badour
00abb9f0da Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1587904 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2d6b3531fdc2d875bfedf4c11e1c4cb3e1774d6a
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to external/setupcompat am: 5798a4d385Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1587904 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic62223132300ea884baa9bb5cb06ad4d18777beb
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/setupcompatBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I960760354dd32558e12c13dfa967f42ff9d462b9
2021-02-01Import updated Android SetupCompat Library 354256040Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug:178993316 Included changes: - 354256040 [GlifLoadingLayout] PartnerConfig of GlifLoadingLaryout d... PiperOrigin-RevId: 354256040 Change-Id: I0a8f31fed53bbea301e1cf3969b1ab8b02a84d48
2021-01-27Import updated Android SetupCompat Library 353709689Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Included changes: - 353709689 Update Android Lint to http://ab/7077792 - 352961466 [GlifLoadingLayout] inflate lottie layout for S+ devices. - 352518649 [SUW][SetupCompact] Add new config for footer button hieght Bug:177494657 PiperOrigin-RevId: 353709689 Change-Id: Ia04875a4365908adcfa10155372f872ba6dacca3
2021-01-12Import updated Android SetupCompat Library 351303342Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Included changes: - 351303342 [SetupCompat] Extract the default value from setupcompat - 351300492 Reorder BC partner resources in sample app - 351286155 [Portal] Implement GmsTaskProgressItem - 351267701 [Portal] Refine interface, return result Bundle when prog... - 350721878 [BC][Stencil] Add partner resource for the content paddin... PiperOrigin-RevId: 351303342 Change-Id: I5f6e27c3fc87aacc9ec829746a2913f7c50d2fa0
2020-12-31Import updated Android SetupCompat Library 349536308Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Included changes: - 349536308 [BC][Stencil] Add partner resource for the item padding t... - 349360486 [SetupDesign] issue fix and refactoring - 349265027 Update language to comply with Android’s inclusive langua... - 349006680 [BC][Stencil] Add partner resource for the item title tex... - 348729496 Cloned from CL 348561620 by 'g4 patch' and removed using ... - 348580285 [SUW][SetupDesign] Enable stencil config for auto text si... - 348565251 Automated g4 rollback of changelist 348561620. - 348561620 [BC][Stencil] Add partner resource for the icon margin to... - 347789412 [BC][Stencil] Add partner resource for the layout margin ... - 347721164 Adds partner config key for transition type - 346894262 [BC][Stencil] Add partner resource for the description te... - 345997245 [BC][Stencil] Add partner resource for the header text ma... - 345388161 [BC][Stencil] Add partner resource for the header contain... - 345182340 Create subtitle mixin for BC layout - 345174090 [SetupDesign] Enable auto text size based on attr PiperOrigin-RevId: 349536308 Change-Id: I107bbbdfc2f8720902a5e31eee524199afc10b5e
2020-12-03Merge "Import updated Android SetupCompat Library 344353742"Pasty Chang
2020-11-30Import updated Android SetupCompat Library 344353742Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Included changes: - 344353742 Extract subtitle margin top & bottom - 343455224 [SetupCompact] export API to get BC stencil configs suppo... - 343202016 [Portal] New API for query is progress service already re... - 343190222 Extract Header margin top & bottom PiperOrigin-RevId: 344353742 Change-Id: I6e0ab3c974ceb7183db37048aae6b9f874b82225
2020-11-25Mark ab/6881855 as merged am: 9e707c4c85 am: fbf5ec69c5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/13112942 Change-Id: Id98e023104119e662bb407ea376fbb76284294e0
2020-11-25Mark ab/6881855 as merged am: 9e707c4c85Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/13112942 Change-Id: Ic3506bf358e72885ddf8e5be55d7309220589e37
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I67310fef6e6ac460bb94cbe6b2c1aada8dd66eef
2020-11-18Import updated Android SetupCompat Library 342766776Setup Wizard Team
Copied from google3/third_party/java_src/android_libs/setupcompat Test: mm Bug: 173567690 Included changes: - 342766776 Extra Icon margin top as attribute - 342749536 Create Glifv4 theme PiperOrigin-RevId: 342766776 Change-Id: I922e86a59a56dd71705770d8d34e96679369e723