summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 4807121 from 742282346a265eebdc0258254050ae42baa24fb2 to pi-releaselineage-16.0_20181101android-build-team Robot2018-05-271-3/+3
|\ | | | | | | Change-Id: If37df7dc47d97e088265bc0c8882292e6eb8607c
| * Import translations. DO NOT MERGEBill Yi2018-05-241-3/+3
| | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Idcc558b44475b856b19294c26e719a6fc0ac6a77
* | Snap for 4751833 from 2c756ae525c5a23aeaed791d8afffc9ada381e6d to pi-releaseandroid-build-team Robot2018-04-293-5/+5
|\| | | | | | | Change-Id: I25b70915d0ba4faf73cb73e30c63efacf5ad7ee5
| * Import translations. DO NOT MERGEBill Yi2018-04-273-5/+5
| | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I8928a7b30341c042d58a3c3c3bf468b07f515074
* | Snap for 4706961 from 8d0074b5e5498afbad51b01df7f2e8eecd8d17ee to pi-releaseandroid-build-team Robot2018-04-086-875/+3
|\| | | | | | | Change-Id: I239f40af9f299e2a688114eb46bea0967901cfd3
| * Import translations. DO NOT MERGEBill Yi2018-04-063-873/+0
| | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I7c4761a76fdb9c6f614f1b117bc3d2e38ed7565f
| * Merge "Rename android.utils.Pools to com.android.photos.util.Pools" into pi-devTreeHugger Robot2018-04-053-2/+3
| |\
| | * Rename android.utils.Pools to com.android.photos.util.PoolsJiyong Park2018-04-053-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.utils.Pools is a class copied from frameworks/base. It was copied because the framework one has been marked as @hide. This caused the class to be duplicated into the Gallery2 apk and the boot classpath. At run-time, the class from bootclasspath was used because the classloader tries to load a class from the parent class loader first. However, this combined with the recent activation of the kill-switch caused a runtime error. Working around the issue by renaming the class copied into the app so that it does not collide with the framework-defined one. Bug: 77544391 Test: build aosp_walleye. Take a video and see it via the Gallery2. The app does not crash. Change-Id: Ia0af4da84242044da2e0ab63e38df243d9769418
* | | Snap for 4696032 from 915d04b422c527a094ebfb19b4795d353d4ceec7 to pi-releaseandroid-build-team Robot2018-04-030-0/+0
|\| | | | | | | | | | | Change-Id: I28d928a2a05cf99692f95b6979f6dc37994503c8
| * | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-020-0/+0
| |\ \ | | |/ | |/|
| | * Import translations. DO NOT MERGEBill Yi2018-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I069ba4d8e9ed5ee1b53c1168df08ba26341ecf31
* | | Snap for 4693621 from bb9b24fdcb4008b4367c7d2ecc1f72eec8839b25 to pi-releaseandroid-build-team Robot2018-04-0125-37/+619
|\| | | | | | | | | | | Change-Id: Iba8b9d87e8f5c64389f2d60c0cc60a1d887e3c71
| * | Import translations. DO NOT MERGEBill Yi2018-03-301-1/+1
| |/ | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ibb87be0ac02ded8777d55f0a5aaf1ce4c6531b6e
| * Merge "Revert "Revert "Move Gallery2 to androidx.""" into pi-devAurimas Liutikas2018-03-3021-34/+34
| |\
| | * Revert "Revert "Move Gallery2 to androidx.""Aurimas Liutikas2018-03-2921-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fac21a096afbe8eb517726cf4f9f093eade87ddc. We can reland this change now that prebuilts/sdk has been updated with the new SDK. (ag/3818779) Bug: 76692459 Change-Id: I73f2ed3d61bc8756d1b7e4ea0e54c58227d5d506
| * | Merge "Revert "Move Gallery2 to androidx."" into pi-devAurimas Liutikas2018-03-2921-34/+34
| |\|
| | * Revert "Move Gallery2 to androidx."Aurimas Liutikas2018-03-2921-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c86745dd27fb93baa1ec22796bb4af207b6b6182. Broke apps target build. Bug: 76692459 Change-Id: I7b3529a9584d72a31b6c16ff4d4155f75d1c57f8
| * | Merge "Move Gallery2 to androidx." into pi-devAurimas Liutikas2018-03-2921-34/+34
| |\|
| | * Move Gallery2 to androidx.Aurimas Liutikas2018-03-2821-34/+34
| | | | | | | | | | | | | | | | | | Bug: 76692459 Test: make -j Gallery2 and run on emulator Change-Id: Ife6a5649c21464f404db3198bd6a4ba8aa901ee8
| * | Import translations. DO NOT MERGEBill Yi2018-03-283-2/+584
| |/ | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I6e8f7f82f201970324bb4ab4b377c65adfa2c2cf
* | Snap for 4632767 from 85b2210bbcb231b4ed2dc158c3a420650098c5de to pi-releaseandroid-build-team Robot2018-03-042-2/+2
|\| | | | | | | Change-Id: I3fdd0444be422712571c60ee6a4dea173a1d16bb
| * Import translations. DO NOT MERGE am: 661db9ffb1 -s oursBill Yi2018-03-030-0/+0
| |\ | | | | | | | | | | | | | | | am: 1608c9536c -s ours Change-Id: I1f3b6ee3ce978b40ea5b522bddfe946b551f5c13
| | * Import translations. DO NOT MERGEBill Yi2018-03-030-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: 661db9ffb1 -s ours Change-Id: I7743a66a3d9672beda62c8d7d40d12c1c39a02d0
| | | * Import translations. DO NOT MERGEBill Yi2018-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I7a4084ae93055c588726afffacb83ecb2402b407
| * | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-03-021-1/+1
| |\ \ \
| | * | | Import translations. DO NOT MERGEBill Yi2018-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I278b784486ae848f4847a32297a10158610dd76f Auto-generated-cl: translation import
| * | | | Merge "Gallery2: Fix CollectionIncompatibleType" am: 7115c7cbf9 am: ae4d8c9a73Andreas Gampe2018-03-021-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | am: c61338150e Change-Id: I48ff76febe268de8af1b2ccfc8f582e9685f6209
| | * | Merge "Gallery2: Fix CollectionIncompatibleType" am: 7115c7cbf9Andreas Gampe2018-03-021-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: ae4d8c9a73 Change-Id: Ic752304dc8191bf42eba98a7f7f64fd12b13f22d
| | | * \ Merge "Gallery2: Fix CollectionIncompatibleType"Andreas Gampe2018-03-021-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7115c7cbf9 Change-Id: I2acf35452fea9973718f971af76dd0964f84423f
| | | | * \ Merge "Gallery2: Fix CollectionIncompatibleType"Treehugger Robot2018-03-021-1/+1
| | | | |\ \
| | | | | * | Gallery2: Fix CollectionIncompatibleTypeAndreas Gampe2018-03-011-1/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect indexOf lookup. Bug: 73288226 Test: m javac-check RUN_ERROR_PRONE=true Change-Id: Ifb158d6f4c5f0eb078f9d4fb37c7da03c2c0a4fe
* | | | | | Snap for 4613997 from c111fb81eb6759e6b745aa9888638878407b9076 to pi-releaseandroid-build-team Robot2018-02-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I581fe1fff30aef853680926761107a9bc2c30b84
| * | | | | Import translations. DO NOT MERGE am: aaae7c4987 -s oursBill Yi2018-02-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 37ebb54c54 -s ours Change-Id: I4418c4cece2c5a88362949bfdfa8215146a406d5
| | * | | | Import translations. DO NOT MERGEBill Yi2018-02-200-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | am: aaae7c4987 -s ours Change-Id: Ic55f4873fd4814c22a6378c6c60718ae5ef1e95a
| | | * | | Import translations. DO NOT MERGEBill Yi2018-02-202-132/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I15c259177a41f9ed7d0c6405e41f7cbd63915d2b
| * | | | | Import translations. DO NOT MERGEBill Yi2018-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb415026064dce428e77746e4188f960de2df6a6 Auto-generated-cl: translation import
* | | | | | Snap for 4585119 from fdabbe743f2eb51319a7af3909231784145c27a0 to pi-releaseandroid-build-team Robot2018-02-051-131/+266
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ede0d2e7af44af7245247f837f5f25d82b5013b
| * | | | | Import translations. DO NOT MERGEBill Yi2018-02-031-131/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21468a80fc8433ef107a00654f26c2cc62e52977 Auto-generated-cl: translation import
* | | | | | Snap for 4571561 from 68272bd5139aef18c1c11e9aca7b29a64af2ea0a to pi-releaseandroid-build-team Robot2018-01-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I711f9fac8f026b101d99724593bc07a71ef97c4c
| * | | | | Import translations. DO NOT MERGE am: 6bd249f96c -s oursBill Yi2018-01-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 29d4297673 -s ours Change-Id: I9225ada19523c70ff0cbeaed0f328f53acd87d25
| | * | | | Import translations. DO NOT MERGEBill Yi2018-01-270-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6bd249f96c -s ours Change-Id: I7ba817d4b1b50272c7feb948467f0c6d7110c718
| | | * | | Import translations. DO NOT MERGEBill Yi2018-01-275-278/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I6419caadf5557a0522adf5bab6202daf45861aab
* | | | | | Snap for 4562879 from a57d161c2e3eafeb0062c065f8185d0464f7f988 to pi-releaseandroid-build-team Robot2018-01-242-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd6d3ed26d9616b171ad3bbec5e0693b9b6bb603
| * | | | | Merge "Gallery2: Fix NaN comparisons" am: 6f8c54d224 am: 9ac972e9bcAndreas Gampe2018-01-232-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9e29df9dd4 Change-Id: I0db897b5532de596616002e0ca1be15cce684915
| | * | | | Merge "Gallery2: Fix NaN comparisons" am: 6f8c54d224Andreas Gampe2018-01-232-4/+4
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | am: 9ac972e9bc Change-Id: I081c00f5e57adc883be2a1e8478cfa467d49166c
| | | * | | Merge "Gallery2: Fix NaN comparisons"Andreas Gampe2018-01-232-4/+4
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | am: 6f8c54d224 Change-Id: Iba67789fa694e0978370dbd0ad60c14bb8222be6
| | | | * | Merge "Gallery2: Fix NaN comparisons"Treehugger Robot2018-01-232-4/+4
| | | | |\ \
| | | | | * | Gallery2: Fix NaN comparisonsAndreas Gampe2018-01-222-4/+4
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Float.isNan for correct evaluation. Found by errorprone. Test: m Change-Id: I3d47a2a64059d9c89528c82a1ca766248db4bdf9
* | | | | | Snap for 4539010 from 1b4ab394786ad42cdd403cfdf146e6b6a8262b2e to pi-releaseandroid-build-team Robot2018-01-113-268/+133
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2ebfc7e7798c47692d9ec7415e5e64a4134b6e46
| * | | | | Import translations. DO NOT MERGEBill Yi2018-01-103-268/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c4e79364350d4b459bf723b690a866ebe663fc0 Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 10:11:45 +0000