summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-08-29[automerger skipped] Migrate setup-wizard-lib to androidx.pie-tempAurimas Liutikas
am: d533ee27e4 -s ours Change-Id: I2530993e1141a7b63fe3fdaf794fa9e3f3230d24
2018-08-28Migrate setup-wizard-lib to androidx.android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseAurimas Liutikas
Test: make setup-wizard-lib Bug: 76692459 Change-Id: I40171e973d442b1a1815e9e7d7c2cc984cb38bac Merged-In: I40171e973d442b1a1815e9e7d7c2cc984cb38bac (cherry picked from commit 4860e4ee4876743b52cb03f2fce3c213ad7a2f6a) (cherry picked from commit 939b955af84a69dd027040664725f3c150683076) (cherry picked from commit 9a8a69a8451038325d9b2d2fe3484e54eded1230)
2018-08-28Migrate setup-wizard-lib to androidx.Aurimas Liutikas
Test: make setup-wizard-lib Bug: 76692459 Change-Id: I40171e973d442b1a1815e9e7d7c2cc984cb38bac Merged-In: I40171e973d442b1a1815e9e7d7c2cc984cb38bac (cherry picked from commit 4860e4ee4876743b52cb03f2fce3c213ad7a2f6a) (cherry picked from commit 939b955af84a69dd027040664725f3c150683076)
2018-08-17Convert frameworks/opt/setupwizard to Android.bpColin Cross
am: 7e019cd4af Change-Id: I9886c72e7066d8872ceb8ce7e9da93ef0bb310ce
2018-08-17Convert frameworks/opt/setupwizard to Android.bpColin Cross
See build/soong/README.md for more information. Test: m checkbuild Change-Id: I91ea161e67e416811d90854a91016c70dafb8ffb Merged-In: I91ea161e67e416811d90854a91016c70dafb8ffb (cherry-picked from commit d901a55fba2f2a80ec62f21a97cc11f98e8022c1)
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
Bug: 112535855 Change-Id: If52bb4da211a25e198c697bb66837b9d5ad1d463
2018-08-07Merge Android Pie into master am: da231a3b6aXin Li
am: cf908d8d87 Change-Id: I4223fc5f0ab6d5397b4754988e06ccdad79c9332
2018-08-07Merge Android Pie into masterXin Li
am: da231a3b6a Change-Id: I7a5f7d6649706636e0838b5b595a4c615de2c42d
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.3Xin Li
Bug: 112104996 Change-Id: I127e4e586242f7bb6011cf96a81ea87c2de6acdf
2018-07-19Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li
am: c5e2c06bca Change-Id: I3b6c0299c668d3b8232325332a759ba1b4dcd3b5
2018-07-19Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li
Bug: 111615259 Change-Id: I53f396c9088201525ec55d039ee523c16dd531e8
2018-06-15Fix ManifestMerger issuesColin Cross
am: 4a5ff8044c Change-Id: I3a250a330cf193fd73a699e5d84d7d3455cccb44
2018-06-15Fix ManifestMerger issuestemp_p_mergeColin Cross
Set LOCAL_MIN_SDK_VERSION in setup-wizard-lib so that the build system doesn't raise the minSdkVersion value specified in the manifest, which causes ManifestMerger to error when trying to merge it into a package that specifies a lower minSdkVersion. Bug: 78447299 Test: m java Change-Id: Ia72327d787c45f6e2f35df97094b92cf6e88e214
2018-06-12Fix Partner.getTextMaurice Lam
am: 466c50ab5c Change-Id: I9be4de6d46052cd7860b0d87dcaf3ba8a4f1e454
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 4761101d3a Change-Id: Iebc5687a339dfd674a4d58be865dd70485328168
2018-06-09Fix Partner.getTextandroid-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devMaurice Lam
Test: ./gradlew test Bug: 109781942 Change-Id: I06c3be06def30803e5dda3069686f0ff510b804d
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
Bug: 79597307 Change-Id: I1698452e32fc68987f0746459e8762450df9e0cc
2018-05-15Fix SwitchItem clipMaurice Lam
am: a65273f3bd Change-Id: Idfe1e617ec8f8cc406bae8ecec3e708930992fbf
2018-05-14Fix SwitchItem clippie-devMaurice Lam
Test: ./gradlew test Bug: 79175394 Change-Id: I3b0824e770b4c0470fc949d0d58f63dec54d7e12 (cherry picked from commit 2c20d03bbd0cb0ad835853f93a00cd509e982836)
2018-05-07Migrate to AAPT2 am: 878bae4e32Alan Viverette
am: 0cb8671d3a Change-Id: I0d6edc02fba76861f7d44ee0d511f1c0a7dab376
2018-05-07[automerger skipped] Get Support Library resources from prebuilts am: 9420375022Jeff Gaston
am: 7774172763 -s ours Change-Id: I7f101e980b78dd7cae894e182cd1bf2d02b9b741
2018-05-07[automerger skipped] Fix import of android-support-annotations am: 97f0b1979bAurimas Liutikas
am: be834c40f0 -s ours Change-Id: I40249a26ce296e29a3ea674692c9ebaac67549c2
2018-05-07Migrate to AAPT2Alan Viverette
am: 878bae4e32 Change-Id: I21b8150ef5f47a5ea1414162fc6874c6f1a6cc63
2018-05-07Get Support Library resources from prebuiltsJeff Gaston
am: 9420375022 Change-Id: Id22a9f168143dac94fdebb59f0d5be7579f78416
2018-05-07Fix import of android-support-annotationsAurimas Liutikas
am: 97f0b1979b Change-Id: Iacab7f74af2b1ba1ad1b141ee695a8a72df120cc
2018-05-04Migrate to AAPT2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1Alan Viverette
Bug: 73128633 Test: make checkbuild Change-Id: Id586feef4975be031173e320b64fa9af0ced6fa6 Merged-In: Id586feef4975be031173e320b64fa9af0ced6fa6 (cherry picked from commit 96d988826b8d8ddd3b81d93a4465569aed5e3b6f)
2018-05-04Get Support Library resources from prebuiltsJeff Gaston
Support Library is changing its build process (postprocessing resource files, via Dejetifier), so its resource files won't be able to be used directly for now. Bug: 74196535 Test: m -j checkbuild Change-Id: I30410d817e4b0a70135c5ed9b7ab3a725307fe09 Merged-In: I30410d817e4b0a70135c5ed9b7ab3a725307fe09 (cherry picked from commit 12b8b856d1a66fd0263558d7c2cb5240f53b4ff1)
2018-05-04Fix import of android-support-annotationsAurimas Liutikas
Bug: 69161825 Test: m checkbuild Change-Id: Ic48ec4a3a5125ebc1fe83ae9b23e7696cd7c0cef Merged-In: Ic48ec4a3a5125ebc1fe83ae9b23e7696cd7c0cef (cherry picked from commit fe4a75413551caa580537f80066396e3e69bac9f)
2018-04-06Revert "Revert "Add workaround for touch event propagation""Maurice Lam
am: e58194099d Change-Id: I31dceae1b8830340fd09f17198e24c726e20f1b0
2018-04-06Revert "Add workaround for touch event propagation"Maurice Lam
am: a6d66b41b0 Change-Id: Ib1c1b56ce50d5b9dde4c609a4d57b627bf91cf81
2018-04-06Revert "Revert "Add workaround for touch event propagation""Maurice Lam
This reverts commit b268a8c365a4c9dcb7b1382a7ce3ec5607b22de0. Rolling forward with suppress for the lint errors Test: ./gradlew lint Bug: 77338508 Change-Id: I9582bfbb4c73ae60a15e8285facf20da458b9690
2018-04-06Revert "Add workaround for touch event propagation"Maurice Lam
This reverts commit e4475dcf52c1235a7d9756b454fa81fb4b54726c. Reason for revert: Breaks ub-setupwizard-master build (lint error) Bug: 77338508 Test: ./gradlew lint Change-Id: I251ff930b7d8391db3ea55597fa42f491cdff963
2018-04-06Add workaround for touch event propagationMaurice Lam
am: e4475dcf52 Change-Id: I5667c60e76feeae99881b06315477a27bcf050d6
2018-04-06Add touch feedback to linksMaurice Lam
am: 618a4449bb Change-Id: Ic6e02b2e57a798a6a893e82058d073e32dbfac42
2018-04-06Add workaround for touch event propagationMaurice Lam
In TextView with links, onTouchEvent always return true regardless of return value from the movement method because View#onTouchEvent is hard coded to return true whenever the view is clickable. In RichTextView, add a layer of abstraction to allow the movement method to override the return value. TouchableLinkMovementMethod is an implementation added, which will consume the event only when a link is being touched. Test: ./gradlew test Bug: 77338508 Change-Id: I761579d6f153a41beb979acd88a4090eb3998cf3
2018-04-04Add touch feedback to linksMaurice Lam
- Clear selection after LinkSpan is clicked so that the highlight effect will be cleared when the tap completes - Set focusableInTouchMode to true and revealOnFocusHint to false in RichTextView for N MR1 or above to allow the highlight effect to be visible in touch mode. Test: ./gradlew test connectedAndroidTest Bug: 73350031 Change-Id: Ibb6f67102775802cdfebaa1529c09d936b4096cb (cherry picked from commit bc1c7a159c14f8b8f532fec60681d34771cd7909)
2018-04-03Add padding to edit textMaurice Lam
am: 1643b5132f Change-Id: I11be63d7d870e179239db1fe1562e4217716284d
2018-04-03Add padding to edit textMaurice Lam
Test: Manual Bug: 69930300 Change-Id: I285f998fb36ef9dbf5132e6a1e203f01071418bb
2018-03-31DO NOT MERGE Migrate to AAPT2Alan Viverette
am: 1cb90b8620 Change-Id: I731c6880d95d0e1e837d5a0adc681ffc393ae6c1
2018-03-30DO NOT MERGE Migrate to AAPT2Alan Viverette
Bug: 73128633 Test: make checkbuild Change-Id: I4871b1d396267805930caa0362cf9af5ac103bb1
2018-03-23Merge "Revert "Update fourcolor progress bar"" into pi-devMaurice Lam
am: 95d8b7ea74 Change-Id: Ie80842a7af868246d61920e077b5ffe253fb45fe
2018-03-23Merge "Revert "Update fourcolor progress bar"" into pi-devMaurice Lam
2018-03-21Revert "Update fourcolor progress bar"Maurice Lam
This reverts commit b5a2d11440eab84ef1ae1f44fb29b0690038c8e5. Reason for revert: UX likes the old blue progress bar better Bug: 63074068 Change-Id: Ide8c1117e4d4aae3016046641a1ff9880dec0f81
2018-03-20Add methods to set GLIF icon content descriptionMaurice Lam
am: 3514ad526a Change-Id: Ie0a873a23f630b27438f7ad318694f36ce7bee37
2018-03-19Add methods to set GLIF icon content descriptionMaurice Lam
Test: ./gradlew connectedAndroidTest Bug: 74435529 Change-Id: I22e3abe8dce0663a7d1e7ee3050d327abeec4ad2 (cherry picked from commit c38af2fb55868523e5ddcceb6331947501f43adf)
2018-03-16Merge "Make links focusableInTouchMode for platform variant" into pi-devMaurice Lam
am: e93708bb62 Change-Id: Idc40816da2d519b3fb93953a78f8660d3b93d42a
2018-03-15Merge "Make links focusableInTouchMode for platform variant" into pi-devTreeHugger Robot
2018-03-14Update fourcolor progress barMaurice Lam
am: b5a2d11440 Change-Id: I061b2cc2223fe010d3fad105f995d4e93a229c6a
2018-03-14Update fourcolor progress barMaurice Lam
Test: Manual. Existing tests pass Bug: 63074068 Change-Id: I52a1704c39a9a54f9a4e79f42d174a20ee96c310 (cherry picked from commit 83817ea0336e6d9a217b4c4585b11dbaf3eb740a)
2018-03-12Add touch feedback to tertiary buttonsMaurice Lam
am: 15d9037e89 Change-Id: I571bde0ce44a2c00a7212446a7d1b46123b9c83f
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 21:21:44 +0000