Merge "Update comments to point to the new location of event.logtags." into main am: 7a4476d637
Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/3377072
Change-Id: Ie4cbce0f020a02ce6664a9121cbf86bc1c1faf37
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0f68870..e1b7075 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -63,7 +63,9 @@
</intent-filter>
</receiver>
- <activity android:name="CalendarDebug" android:label="@string/calendar_info"
+ <activity android:name="CalendarDebug"
+ android:theme="@style/OptOutEdgeToEdgeEnforcement"
+ android:label="@string/calendar_info"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 0000000..a088894
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2024 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+<resources>
+ <style name="OptOutEdgeToEdgeEnforcement">
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+ </style>
+</resources>
