summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 37f9dbad53 -s ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-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_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-s-v2-preview-1Xin Li
ours am: 1de8f8ca37 -s ours am skip reason: Change-Id I74f76260be0f78d089380e978c12ca63ebac799f with SHA-1 88de292fce is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I707c8790845c4bc24b2e67dc4c5ce90735145880
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 37f9dbad53 -s oursXin Li
am skip reason: Change-Id I74f76260be0f78d089380e978c12ca63ebac799f with SHA-1 88de292fce is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ideab615d8337febe0bdad907ae9bcac6d4489d87
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I74f76260be0f78d089380e978c12ca63ebac799f Change-Id: Ifba634467b8206622448eef9dd37c78e75aee0ed
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCamera" am: ↵Bob Badour
5ef76d204d am: 1068dba4aa am: dd03733224 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1576150 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5837ce4ef16f25ddef3d7e83878adf6d54d9eac0
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCamera" am: ↵Bob Badour
5ef76d204d am: 1068dba4aa Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1576150 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica8ae63732620e0454788d3ac231442832b87687
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCamera" am: ↵Bob Badour
5ef76d204d Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1576150 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I34cce8ea5ed17bbc307e1699e17dabb3e7e00b75
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCamera"android-s-preview-1Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCameraBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp jni/Android.bp tests/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I8a100e681b77959099a8a547078f60efd7d32fc9
2020-12-14Merge "Revert^2 "Add <uses-library> information."" am: 88c8330514 am: ↵Diego Vela
37ae78c4ad am: 88de292fce Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1526687 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If450dacef27517aad24217265388790d07b1fd1d
2020-12-14Merge "Revert "Add <uses-library> information."" am: 5d33018c8b am: ↵Diego Vela
3e5432799e am: 590f9e6a27 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1527777 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I438f24c38d3d5131638db29c8cee92292147383b
2020-12-14Merge "Revert^2 "Add <uses-library> information."" am: 88c8330514 am: 37ae78c4adDiego Vela
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1526687 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I74f76260be0f78d089380e978c12ca63ebac799f
2020-12-14Merge "Revert "Add <uses-library> information."" am: 5d33018c8b am: 3e5432799eDiego Vela
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1527777 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7d32619aeda136f847664ed25be29f82b7f25e3c
2020-12-14Merge "Revert^2 "Add <uses-library> information."" am: 88c8330514Diego Vela
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1526687 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ae2512522a75cb9d8f1c9fa7b20f388761aa7a0
2020-12-14Merge "Revert^2 "Add <uses-library> information.""Diego Vela
2020-12-14Revert^2 "Add <uses-library> information."Diego Vela
5ac66fa4fa3cf4443ba33844cbf85207a4593553 Change-Id: Ia05d219b6ae48ae620ba0ec823918b357efed389
2020-12-14Merge "Revert "Add <uses-library> information."" am: 5d33018c8bDiego Vela
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1527777 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6194bdd41683b92eb0b16c649214cedbc4866340
2020-12-14Merge "Revert "Add <uses-library> information.""Diego Vela
2020-12-14Revert "Add <uses-library> information."Diego Vela
Revert "Add <uses-library> information." Revert "Add <uses-library> information." Revert "Add <uses-library> information." Revert submission 1427961-uses-libs-23 Reason for revert: Broken build Bug: 175607244 Reverted Changes: I6ab699005:Add <uses-library> information. Id5d5fe1df:Add <uses-library> information. Id12741c9b:Add <uses-library> information. I2fe6e09c2:Add <uses-library> information. Change-Id: I94232ba1b12e25557734d43fe80835d955873bc5
2020-12-10Merge "Revert "Add <uses-library> information."" am: 3b9cd1b323 am: ↵Sahana Rao
a12a59223f am: c19903b89a Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1521940 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie23d7ff925be5fbd56f0a2b42585338b610603e6
2020-12-10Merge "Revert "Add <uses-library> information."" am: 3b9cd1b323 am: a12a59223fSahana Rao
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1521940 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5524746acf81cd6b499eaeadf227383c93ec7ed2
2020-12-10Merge "Add <uses-library> information." am: 9b1fe3581c am: 641fcf10d4 am: ↵Ulyana Trafimovich
3cc8e892ed Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1427664 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc343f3766ff2a3fd0d26759bd72883fe8e3dda1
2020-12-10Merge "Revert "Add <uses-library> information."" am: 3b9cd1b323Sahana Rao
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1521940 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1a66f83c0e39ad68e89f23ad3ec2fc6881c63b96
2020-12-10Merge "Add <uses-library> information." am: 9b1fe3581c am: 641fcf10d4Ulyana Trafimovich
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1427664 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I40edaa7540cd75ae86727e56b6248d3933e1eebf
2020-12-10Merge "Revert "Add <uses-library> information.""Sahana Rao
2020-12-10Revert "Add <uses-library> information."Sahana Rao
Reason for revert: b/175286760 Reverted Changes: I6ab699005:Add <uses-library> information. Change-Id: I844cc23b2737787470973056b83fd5df885025ef
2020-12-10Merge "Add <uses-library> information." am: 9b1fe3581cUlyana Trafimovich
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1427664 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I07d076a230ec2a394781a38bed948717cabd9365
2020-12-10Merge "Add <uses-library> information."Ulyana Trafimovich
2020-11-23Mark ab/6881855 as merged am: 776bed5621 am: 97c201f469Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/13112988 Change-Id: I25d482a1f678404c5e6b3bee84e956032a3c5579
2020-11-23Mark ab/6881855 as merged am: 776bed5621Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/13112988 Change-Id: I79844c5979aed7ce058f0e278e17df2544612eb8
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I6130fc7cb13979c684e48de922172f2029b0e104
2020-10-27Add <uses-library> information.Ulya Trafimovich
The optional <uses-library> "com.google.android.media.effects" must be added explicitly to `optional_uses_libs`, because Soong cannot add it automatically to the manifest_fixer (it is not an SDK library dependency and it is optional). Bug: 132357300 Test: lunch cf_x86_phone-userdebug && m Test: m out/soong/.intermediates/packages/apps/LegacyCamera/LegacyCamera/android_common/manifest_check/AndroidManifest.xml Change-Id: I6ab69900592c00a16426223e8f0baaf6eb41e033
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9010bb8d52 -s ours am: ↵Xin Li
ccdcf55b5c -s ours am: 661bae5e13 -s ours am skip reason: Change-Id I1bcbd2ce3cfbe039c06c2d53480bd24150f42ae4 with SHA-1 dd27ddb74b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12797516 Change-Id: I61b80aa45bb334491976b59136ab58bf3556ee12
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9010bb8d52 -s ours am: ↵Xin Li
ccdcf55b5c -s ours am skip reason: Change-Id I1bcbd2ce3cfbe039c06c2d53480bd24150f42ae4 with SHA-1 dd27ddb74b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12797516 Change-Id: I99ba8983fde0ab4d3926f87808e5635fadeed32c
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9010bb8d52 -s oursXin Li
am skip reason: Change-Id I1bcbd2ce3cfbe039c06c2d53480bd24150f42ae4 with SHA-1 dd27ddb74b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12797516 Change-Id: I244192f56173ad53523fb1b452ff2c6c183465da
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I1bcbd2ce3cfbe039c06c2d53480bd24150f42ae4 Change-Id: Iabfcad586803fcc3a9e451fc62c0272cb310bce4
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f914cf01ba -s ours am: 073829dcd1 -s ours am: 7581f9b916 -s ours am: 97505a4e1c -s ours am skip reason: Change-Id Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a with SHA-1 0793b42838 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12469921 Change-Id: Ia38305ee56665dc6f04c0facdb609d4f30447c85
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f914cf01ba -s ours am: 073829dcd1 -s ours am: 7581f9b916 -s ours am skip reason: Change-Id Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a with SHA-1 0793b42838 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12469921 Change-Id: I046a2e7058de88eee79cd81f8952b66f0496ef7d
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f914cf01ba -s ours am: 073829dcd1 -s ours am skip reason: Change-Id Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a with SHA-1 0793b42838 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12469921 Change-Id: I1cc839bc8764630a9fa83adfbfa6979c4d280394
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f914cf01ba -s ours am skip reason: Change-Id Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a with SHA-1 0793b42838 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12469921 Change-Id: Ie2ce6126a7736f07cd4cef2961c57ec97d70a459
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a Change-Id: Iac3475e1d2188085d6d87412f7b9d1304521f573
2020-08-13Merge "Menu of Camera App is all gone" am: eae7899598 am: 5cedf450bb am: ↵Raman Tenneti
2ccc28dbb2 am: ec627a63c4 am: ef10818f63 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/977011 Change-Id: I511f76b77c41ab32ba0a7351f8d855c6e28b1116
2020-08-13Merge "Menu of Camera App is all gone" am: eae7899598 am: 5cedf450bb am: ↵Raman Tenneti
2ccc28dbb2 am: ec627a63c4 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/977011 Change-Id: Ide1f3ac0bd3d57e5b40112dd22f4c87c8510b484
2020-08-13Merge "Menu of Camera App is all gone" am: eae7899598 am: 5cedf450bb am: ↵Raman Tenneti
2ccc28dbb2 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/977011 Change-Id: I0fc77315c367143a6a93b92ab628dcb39e5704bd
2020-08-13Merge "Menu of Camera App is all gone" am: eae7899598 am: 5cedf450bbRaman Tenneti
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/977011 Change-Id: Ie1107aea0395751629b783ff71ab3590a7de9335
2020-08-13Merge "Menu of Camera App is all gone" am: eae7899598Raman Tenneti
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/977011 Change-Id: Ie04d30336afc6b200a121289dfba9ac4c95c634b
2020-08-13Merge "Menu of Camera App is all gone"Raman Tenneti
2020-07-31Menu of Camera App is all goneFang Hui
ZoomControlWheel is default added in res/layout-sw600dp/camera_control.xml, If zoom not supported, should remove this view, or the radians of other view will be caculated error, thus control wheel show abnormal. Change-Id: I36f3407cc34d767b909363578131e353a660b6e1 Signed-off-by: Fang Hui <hui.fang@nxp.com>
2020-07-30Merge "AOSP/LegacyCamera - Update language to comply with Android's ↵Treehugger Robot
inclusive language guidance." am: 79a62e3c66 am: 0cb7a1b463 am: d82899c85d am: dd27ddb74b am: 8f38d92489 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1378759 Change-Id: Ie0a75303b1fee5cc83168f695a0721442ae4a657
2020-07-30Merge "AOSP/LegacyCamera - Update language to comply with Android's ↵Treehugger Robot
inclusive language guidance." am: 79a62e3c66 am: 0cb7a1b463 am: d82899c85d am: dd27ddb74b Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1378759 Change-Id: Ifd6cf2a7ba92b4ed7448b1e75dc8f776a9678396
2020-07-30Merge "AOSP/LegacyCamera - Update language to comply with Android's ↵Treehugger Robot
inclusive language guidance." am: 79a62e3c66 am: 0cb7a1b463 am: d82899c85d Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1378759 Change-Id: I1bcbd2ce3cfbe039c06c2d53480bd24150f42ae4
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 18:39:44 +0000