dimagi · avazirna · Jan 19, 2025 · Oct 17, 2024 · Oct 22, 2024 · Oct 23, 2024
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ git clone https://github.com/dimagi/commcare-core.git
 
 - Open Android Studio
 - If this is your first time using Android Studio, click "Config" and setup the Android SDK.
-- Download the Android 12 (API 31) SDK Platform and the Google APIs for 31.
+- Download the Android 15 (API 35) SDK Platform and the Google APIs for 35.
 - Now go back to the Android Studio Welcome dashboard and click "Import project (Eclipse ADT, Gradle, etc.)"
 - Select AndroidStudioProjects > CommCare > commcare-android and hit OK
 - Click "OK" to use the Gradle wrapper

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
@@ -71,6 +71,11 @@
         android:label="@string/permission_external_action_label"
         />
 
+    <permission-group
+        android:name="commcare.permission-group.INTERNAL_ACTION"
+        android:label="@string/permission_group_internal_action_label"
+        />
+
     <permission
         android:description="@string/permission_content_provider_description"
         android:label="@string/permission_content_provider_label"
@@ -87,6 +92,14 @@
         android:protectionLevel="dangerous">
     </permission>
 
+    <permission
+        android:name="${applicationId}.permission.PROTECT_FALSELY_EXPOSED_COMPONENTS"
+        android:label="@string/permission_protect_falsely_exposed_components_label"
+        android:description="@string/permission_protect_falsely_exposed_components_description"
+        android:permissionGroup="commcare.permission-group.INTERNAL_ACTION"
+        android:protectionLevel="signature">
+    </permission>
+
     <queries>
         <intent>
             <action android:name="android.intent.action.TTS_SERVICE" />
@@ -346,7 +359,8 @@
 
         <activity
             android:name="org.commcare.gis.DrawingBoundaryActivity"
-            android:exported="false">
+            android:permission="org.commcare.dalvik.permission.PROTECT_FALSELY_EXPOSED_COMPONENTS"
+            android:exported="true">
             <intent-filter>
                 <action android:name="org.commcare.dalvik.action.DrawBoundary"/>
 
@@ -399,17 +413,19 @@
             </intent-filter>
         </activity>
         <activity
-            android:exported="false"
-            android:name="org.commcare.android.nfc.NfcWriteActivity">
+            android:exported="true"
+            android:name="org.commcare.android.nfc.NfcWriteActivity"
+            android:permission="org.commcare.dalvik.permission.PROTECT_FALSELY_EXPOSED_COMPONENTS">
             <intent-filter>
                 <action android:name="org.commcare.nfc.WRITE"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <activity
-            android:exported="false"
-            android:name="org.commcare.android.nfc.NfcReadActivity">
+            android:exported="true"
+            android:name="org.commcare.android.nfc.NfcReadActivity"
+            android:permission="org.commcare.dalvik.permission.PROTECT_FALSELY_EXPOSED_COMPONENTS">
             <intent-filter>
                 <action android:name="org.commcare.nfc.READ"/>
 
@@ -427,9 +443,9 @@
         </receiver>
 
         <receiver
-            android:exported="true"
             android:name="org.commcare.provider.CommCareLogoutReceiver"
-            android:permission="org.commcare.dalvik.permission.COMMCARE_LOGOUT">
+            android:permission="org.commcare.dalvik.permission.COMMCARE_LOGOUT"
+            android:exported="true">
             <intent-filter>
                 <action android:name="org.commcare.dalvik.api.action.CommCareLogoutAction"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -503,8 +519,8 @@
         </activity>
         <activity
             android:name="org.commcare.print.TemplatePrinterActivity"
-            android:exported="false"
-            android:theme="@style/Theme.Dialog.NoTitle">
+            android:permission="org.commcare.dalvik.permission.PROTECT_FALSELY_EXPOSED_COMPONENTS"
+            android:exported="true">
             <intent-filter>
                 <action android:name="org.commcare.dalvik.action.PRINT"/>
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -100,7 +100,6 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging:21.1.0'
     implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
-    implementation (name: 'rtl-viewpager-2.0.0', ext: 'aar')
     implementation('com.github.bumptech.glide:glide:4.9.0') {
         exclude group: 'com.android.support'
     }

diff --git a/app/libs/rtl-viewpager-2.0.0.aar b/app/libs/rtl-viewpager-2.0.0.aar
diff --git a/app/res/drawable-hdpi/icon_chevron_left_attnpos.png b/app/res/drawable-hdpi/icon_chevron_left_attnpos.png
diff --git a/app/res/drawable-hdpi/icon_chevron_right_attnpos.png b/app/res/drawable-hdpi/icon_chevron_right_attnpos.png
diff --git a/app/res/drawable-ldpi/icon_chevron_left_attnpos.png b/app/res/drawable-ldpi/icon_chevron_left_attnpos.png
diff --git a/app/res/drawable-ldpi/icon_chevron_right_attnpos.png b/app/res/drawable-ldpi/icon_chevron_right_attnpos.png
diff --git a/app/res/drawable-mdpi/icon_chevron_left_attnpos.png b/app/res/drawable-mdpi/icon_chevron_left_attnpos.png
diff --git a/app/res/drawable-mdpi/icon_chevron_right_attnpos.png b/app/res/drawable-mdpi/icon_chevron_right_attnpos.png
diff --git a/app/res/drawable-xhdpi/icon_chevron_left_attnpos.png b/app/res/drawable-xhdpi/icon_chevron_left_attnpos.png
diff --git a/app/res/drawable-xhdpi/icon_chevron_right_attnpos.png b/app/res/drawable-xhdpi/icon_chevron_right_attnpos.png
diff --git a/app/res/drawable/commcare_actionbar_logo.xml b/app/res/drawable/commcare_actionbar_logo.xml
@@ -1,12 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M10,10m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M17.591,8.821C17.286,7.737 16.584,6.836 15.611,6.287C15.111,6.005 14.57,5.834 14.018,5.775C13.992,5.539 13.95,5.304 13.886,5.071C13.582,3.987 12.879,3.086 11.907,2.537C10.934,1.987 9.809,1.854 8.738,2.162C7.667,2.47 6.777,3.181 6.235,4.166C5.956,4.672 5.788,5.22 5.729,5.779C5.496,5.805 5.264,5.847 5.034,5.912C3.963,6.22 3.073,6.931 2.53,7.916C1.988,8.9 1.856,10.039 2.16,11.124C2.465,12.208 3.167,13.108 4.14,13.658C4.639,13.94 5.181,14.11 5.733,14.17C5.759,14.405 5.801,14.641 5.865,14.873C6.169,15.958 6.872,16.858 7.844,17.408C8.817,17.957 9.942,18.09 11.013,17.782C12.084,17.474 12.974,16.763 13.516,15.778C13.795,15.273 13.963,14.725 14.022,14.165C14.255,14.139 14.487,14.097 14.717,14.032C15.788,13.724 16.678,13.013 17.221,12.029C17.762,11.044 17.893,9.905 17.591,8.821ZM7.498,4.88C7.853,4.238 8.432,3.773 9.132,3.572C9.832,3.371 10.566,3.458 11.201,3.816C11.837,4.175 12.295,4.762 12.494,5.47C12.532,5.606 12.557,5.743 12.574,5.882C12.634,6.365 12.569,6.852 12.378,7.303C12.341,7.391 12.3,7.479 12.252,7.565C12.145,7.76 11.948,8.091 11.711,8.481C10.755,7.868 8.835,6.644 8.203,6.287C7.875,6.102 7.53,5.969 7.176,5.879C7.217,5.532 7.326,5.194 7.498,4.88ZM10.946,9.973C10.946,10.571 10.466,11.057 9.875,11.057C9.284,11.057 8.804,10.571 8.804,9.973C8.804,9.374 9.284,8.889 9.875,8.889C10.466,8.889 10.946,9.374 10.946,9.973ZM6.233,11.666C6.05,11.997 5.919,12.347 5.831,12.705C5.488,12.662 5.154,12.552 4.844,12.377C4.21,12.019 3.75,11.432 3.551,10.723C3.353,10.015 3.438,9.272 3.793,8.629C4.147,7.985 4.727,7.521 5.426,7.32C5.561,7.281 5.696,7.257 5.833,7.239C6.31,7.179 6.792,7.244 7.237,7.437C7.324,7.475 7.411,7.518 7.496,7.566C7.688,7.674 8.015,7.874 8.401,8.114C7.796,9.082 6.587,11.027 6.233,11.666ZM12.251,15.064C11.897,15.706 11.317,16.172 10.617,16.373C9.918,16.574 9.184,16.487 8.548,16.128C7.913,15.77 7.454,15.183 7.256,14.475C7.217,14.339 7.193,14.201 7.176,14.063C7.116,13.58 7.18,13.093 7.37,12.642C7.407,12.553 7.448,12.465 7.497,12.38C7.604,12.185 7.801,11.854 8.038,11.463C8.995,12.076 10.914,13.301 11.547,13.658C11.874,13.843 12.22,13.976 12.574,14.066C12.532,14.412 12.424,14.751 12.251,15.064ZM15.955,11.314C15.601,11.958 15.021,12.422 14.322,12.623C14.188,12.662 14.052,12.686 13.915,12.704C13.438,12.764 12.957,12.699 12.511,12.506C12.424,12.468 12.337,12.426 12.252,12.377C12.06,12.269 11.733,12.069 11.347,11.829C11.953,10.861 13.162,8.918 13.515,8.277C13.698,7.946 13.829,7.596 13.918,7.238C14.26,7.281 14.594,7.391 14.904,7.566C15.538,7.925 15.998,8.511 16.197,9.22C16.395,9.928 16.31,10.673 15.955,11.314Z"
+      android:pathData="M23.757,10.267C23.294,8.635 22.223,7.279 20.741,6.452C19.979,6.028 19.155,5.771 18.313,5.682C18.273,5.327 18.21,4.973 18.112,4.622C17.649,2.99 16.578,1.635 15.096,0.808C13.614,-0.019 11.9,-0.219 10.267,0.244C8.635,0.708 7.28,1.778 6.453,3.26C6.028,4.022 5.772,4.847 5.682,5.689C5.328,5.728 4.973,5.791 4.623,5.889C2.991,6.352 1.635,7.423 0.808,8.905C-0.019,10.387 -0.219,12.101 0.244,13.733C0.708,15.365 1.779,16.721 3.26,17.548C4.022,17.972 4.847,18.229 5.689,18.318C5.728,18.673 5.791,19.027 5.889,19.378C6.353,21.01 7.423,22.365 8.905,23.192C10.387,24.019 12.102,24.219 13.734,23.756C15.366,23.292 16.722,22.222 17.549,20.74C17.973,19.978 18.23,19.153 18.319,18.311C18.674,18.272 19.028,18.209 19.379,18.111C21.011,17.648 22.367,16.577 23.194,15.095C24.018,13.613 24.219,11.899 23.757,10.267ZM8.379,4.335C8.918,3.369 9.802,2.668 10.868,2.366C11.934,2.063 13.053,2.194 14.021,2.734C14.99,3.273 15.688,4.157 15.991,5.223C16.049,5.427 16.086,5.634 16.112,5.843C16.204,6.57 16.106,7.303 15.814,7.982C15.758,8.115 15.695,8.248 15.623,8.376C15.46,8.67 15.159,9.168 14.798,9.755C13.34,8.833 10.415,6.99 9.451,6.452C8.953,6.174 8.427,5.974 7.887,5.839C7.95,5.317 8.115,4.807 8.379,4.335ZM13.632,12.001C13.632,12.902 12.901,13.633 12,13.633C11.099,13.633 10.368,12.902 10.368,12.001C10.368,11.1 11.099,10.369 12,10.369C12.901,10.369 13.632,11.1 13.632,12.001ZM6.451,14.549C6.172,15.047 5.972,15.574 5.837,16.114C5.315,16.048 4.805,15.883 4.333,15.62C3.367,15.08 2.666,14.197 2.364,13.13C2.061,12.064 2.192,10.946 2.732,9.977C3.271,9.009 4.155,8.311 5.221,8.008C5.426,7.949 5.632,7.912 5.841,7.886C6.568,7.795 7.301,7.893 7.98,8.184C8.113,8.241 8.246,8.306 8.374,8.378C8.668,8.541 9.166,8.842 9.754,9.203C8.831,10.661 6.99,13.587 6.451,14.549ZM15.621,19.665C15.081,20.631 14.198,21.332 13.131,21.634C12.065,21.937 10.946,21.806 9.978,21.266C9.01,20.727 8.311,19.843 8.009,18.777C7.95,18.573 7.913,18.366 7.887,18.157C7.795,17.43 7.893,16.697 8.183,16.018C8.239,15.885 8.302,15.752 8.376,15.624C8.54,15.33 8.84,14.832 9.201,14.245C10.659,15.167 13.584,17.01 14.548,17.548C15.046,17.826 15.573,18.026 16.112,18.161C16.049,18.684 15.884,19.193 15.621,19.665ZM21.265,14.02C20.726,14.989 19.842,15.687 18.776,15.99C18.572,16.048 18.365,16.085 18.156,16.111C17.429,16.203 16.696,16.105 16.017,15.813C15.884,15.757 15.751,15.694 15.623,15.62C15.329,15.457 14.831,15.156 14.243,14.795C15.166,13.337 17.009,10.413 17.546,9.449C17.825,8.95 18.025,8.424 18.16,7.884C18.683,7.949 19.192,8.115 19.664,8.378C20.63,8.918 21.331,9.801 21.633,10.867C21.936,11.934 21.805,13.054 21.265,14.02Z"
       android:fillColor="#ffffff"/>
 </vector>
diff --git a/app/res/drawable/icon_chevron_left_attnpos.png b/app/res/drawable/icon_chevron_left_attnpos.png
diff --git a/app/res/drawable/icon_chevron_right_attnpos.png b/app/res/drawable/icon_chevron_right_attnpos.png
diff --git a/app/res/drawable/rounded_button_shape.xml b/app/res/drawable/rounded_button_shape.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle"   >
-
-    <size
-        android:minHeight="@dimen/min_button_height">
-    </size>
-
-    <corners android:radius="@dimen/rounded_button_corner_radius"/>
-</shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="2dp" android:left="2dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/darker_gray" />
+            <corners android:radius="@dimen/rounded_button_corner_radius" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/res/drawable/title_case_tab_vertical.xml b/app/res/drawable/title_case_tab_vertical.xml
diff --git a/app/res/drawable/title_neutral_tab_vertical.xml b/app/res/drawable/title_neutral_tab_vertical.xml
diff --git a/app/res/layout/app_manager.xml b/app/res/layout/app_manager.xml
@@ -43,7 +43,6 @@
         android:layout_centerHorizontal="true"
         android:layout_below="@id/manager_instructions"
         android:layout_marginTop="@dimen/standard_spacer"
-        android:textSize="@dimen/font_size_xlarge"
         android:paddingHorizontal="@dimen/standard_spacer_double"
         android:onClick="installAppClicked"
         android:text="@string/install_app" />

diff --git a/app/res/layout/custom_alert_dialog.xml b/app/res/layout/custom_alert_dialog.xml
@@ -76,33 +76,46 @@
                 android:id="@+id/positive_button"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/min_button_height"
-                android:padding="@dimen/standard_spacer"
+                android:padding="@dimen/standard_spacer_half"
+                android:paddingEnd="@dimen/standard_spacer"
+                android:paddingStart="@dimen/standard_spacer"
+                android:includeFontPadding="false"
                 android:visibility="gone"
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/standard_spacer"
-                android:layout_marginStart="@dimen/standard_spacer"/>
+                android:layout_marginStart="@dimen/spacer_small"
+                android:textSize="@dimen/font_size_medium"/>
 
             <com.google.android.material.button.MaterialButton
                 app:strokeColor="@color/cc_brand_color"
                 android:id="@+id/neutral_button"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/min_button_height"
-                android:padding="@dimen/standard_spacer"
                 android:layout_marginEnd="@dimen/standard_spacer"
+                android:layout_marginStart="@dimen/spacer_small"
+                android:padding="@dimen/standard_spacer_half"
+                android:paddingEnd="@dimen/standard_spacer"
+                android:paddingStart="@dimen/standard_spacer"
+                android:includeFontPadding="false"
                 android:visibility="gone"
-                android:layout_toStartOf="@id/positive_button"/>
+                android:layout_toStartOf="@id/positive_button"
+                android:textSize="@dimen/font_size_medium"/>
 
             <com.google.android.material.button.MaterialButton
                 style="@style/NegativeButtonStyle"
                 android:id="@+id/negative_button"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/min_button_height"
-                android:padding="@dimen/standard_spacer"
+                android:padding="@dimen/standard_spacer_half"
+                android:paddingEnd="@dimen/standard_spacer"
+                android:paddingStart="@dimen/standard_spacer"
+                android:includeFontPadding="false"
                 app:strokeColor="@color/cc_brand_color"
                 android:visibility="gone"
-                android:layout_marginStart="@dimen/standard_spacer"
+                android:layout_marginStart="@dimen/spacer_small"
                 android:layout_marginEnd="@dimen/standard_spacer"
-                android:layout_toStartOf="@id/neutral_button"/>
+                android:layout_toStartOf="@id/neutral_button"
+                android:textSize="@dimen/font_size_medium"/>
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/res/layout/progress_dialog_cancel_button.xml b/app/res/layout/progress_dialog_cancel_button.xml
@@ -13,6 +13,7 @@
     android:layout_marginRight="@dimen/standard_spacer_large"
     android:layout_marginBottom="@dimen/standard_spacer"
     android:padding="@dimen/standard_spacer"
+    android:textSize="@dimen/font_size_medium"
     android:text="STOP"
-    android:visibility="visible"
+    android:visibility="gone"
     tools:viewBindingIgnore="true" />
diff --git a/app/res/layout/prompt_view.xml b/app/res/layout/prompt_view.xml
@@ -40,7 +40,7 @@
             <com.google.android.material.button.MaterialButton
                 android:layout_height="wrap_content"
                 app:backgroundTint="@color/solid_green"
-                android:textSize="@dimen/font_size_xlargest"
+                android:textSize="@dimen/font_size_xlarge"
                 android:layout_margin="16dp"
                 android:layout_width="wrap_content"
                 android:id="@+id/action_button"/>

diff --git a/app/res/layout/screen_form_entry.xml b/app/res/layout/screen_form_entry.xml
@@ -132,6 +132,7 @@
             android:background="@drawable/btn_finish_background"
             android:visibility="gone"
             app:clip_start_x="0.42"
+            app:clip_corner_radius="@dimen/rounded_button_corner_radius"
             android:clickable="true"
             android:focusable="true"
             android:layout_toEndOf="@+id/nav_btn_prev"