summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-07-30Merge "AOSP/LegacyCamera - Update language to comply with Android's ↵Treehugger Robot
inclusive language guidance." am: 79a62e3c66 am: 0cb7a1b463 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1378759 Change-Id: Idd041448842915829133bbd67e1943f5532047fc
2020-07-30Merge "AOSP/LegacyCamera - Update language to comply with Android's ↵Treehugger Robot
inclusive language guidance." am: 79a62e3c66 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1378759 Change-Id: I38c302ecc974ea290a14c659a6fda59004a5df33
2020-07-29Merge "AOSP/LegacyCamera - Update language to comply with Android's ↵Treehugger Robot
inclusive language guidance."
2020-07-29AOSP/LegacyCamera - Update language to comply with Android's inclusive ↵Raman Tenneti
language guidance. See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Test: make LegacyCameraTests and make LegacyCamera Change-Id: I02aabde9b57ad14a5379c6ad3cbf921855c9b9d6
2020-05-20Merge "Add an exported flag in manifest" am: 47f31ce7ae am: 0d54a1dd67 am: ↵Treehugger Robot
0793b42838 am: 36b83e644a am: 7156e3024b Change-Id: I560fbe0cc7335d8883bb4dc5a1fc4285022388f3
2020-05-20Merge "Add an exported flag in manifest" am: 47f31ce7ae am: 0d54a1dd67 am: ↵Treehugger Robot
0793b42838 am: 36b83e644a Change-Id: I521a28148f016676384126ef25bb06f15fc79e62
2020-05-20Merge "Add an exported flag in manifest" am: 47f31ce7ae am: 0d54a1dd67 am: ↵Treehugger Robot
0793b42838 Change-Id: Ibaf54b40351924391aef5be5a0a15b3917b410ab
2020-05-20Merge "Add an exported flag in manifest" am: 47f31ce7ae am: 0d54a1dd67Treehugger Robot
Change-Id: Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a
2020-05-20Merge "Add an exported flag in manifest" am: 47f31ce7aeandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I561fc72964aee248c2f625b3241632f9ac55513a
2020-05-20Merge "Add an exported flag in manifest"Treehugger Robot
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from LegacyCamera" am: f0465aa7dd am: ↵Treehugger Robot
883837a1ea am: 678fa82345 am: f9fa36e45c am: 4c2f79b99f Change-Id: I7d5425dac5b9d5d454176b9a881e678357681e01
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from LegacyCamera" am: f0465aa7dd am: ↵Treehugger Robot
883837a1ea am: 678fa82345 am: f9fa36e45c Change-Id: Icabeb4c4c99f603dcaf81d4b6b9b027bb741dc0c
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from LegacyCamera" am: f0465aa7dd am: ↵Treehugger Robot
883837a1ea am: 678fa82345 Change-Id: Iee4386f4a64aacaaa4337ad693c2a1cff6f803ec
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from LegacyCamera" am: f0465aa7dd am: ↵Treehugger Robot
883837a1ea Change-Id: I7a81ca66a02aecf134a2c49c5e795d79f705013d
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from LegacyCamera" am: f0465aa7ddTreehugger Robot
Change-Id: I2dd6d76bdfba131d490f09c903b604d48ab7f304
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from LegacyCamera"Treehugger Robot
2020-04-27Remove MODULE_LICENSE_APACHE2 from LegacyCameraBob Badour
Repositories containing third-party code need a METADATA and a license_type. Repositories containing only first-party code no longer need a MODULE_LICENSE_* file. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ib0ca389a921b7c425e83d54f85f3de39d0e7bfd5
2020-03-23Add an exported flag in manifestAshwini Oruganti
With b/150232615, we will need an explicit value set for the exported flag when intent filters are present, as the default behavior is changing for S+. This change adds the value reflecting the previous default to the manifest. These changes were made using an automated tool, the xml file may be reformatted slightly creating a larger diff. The only "real" change is the addition of "android:exported" to activities, services, and receivers that have one or more intent-filters. Bug: 150232615 Test: TH Exempt-From-Owner-Approval: mechanical refactoring Change-Id: I8c2651cd95317bd66bb8185476d2a5e03f6e7441
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 00:01:17 +0000