From 50d6dc2de8e104a14f060a4d07d37123ddd88d2a Mon Sep 17 00:00:00 2001
From: shivasku82 <shiva.kumara.rudrappa@intel.com>
Date: Mon, 18 Nov 2024 12:50:30 +0530
Subject: [PATCH] Reorder Preference Screen in Settings Activity

Issue Detailed: First Preference Screen in Camera Settings Activity is
not getting displayed leading to resolution& quality screen not getting
displayed.

Issue Fixed: Reordered the Preference Screen to display Advanced
Preference Screen first by forcefully enabling Advanced
Preference Screen.

Tested-On: Checked Resolution Screen is displayed in AOSP Camera
Settings

Tracked-On: OAM-127026
Signed-off-by: NaveenVenturi1203 <venturi.naveen@intel.com>
Signed-off-by: shivasku82 <shiva.kumara.rudrappa@intel.com>
---
 ...04-WA-Reorder-preference-in-settings.patch | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 aosp_diff/preliminary/packages/apps/Camera2/04_0004-WA-Reorder-preference-in-settings.patch

diff --git a/aosp_diff/preliminary/packages/apps/Camera2/04_0004-WA-Reorder-preference-in-settings.patch b/aosp_diff/preliminary/packages/apps/Camera2/04_0004-WA-Reorder-preference-in-settings.patch
new file mode 100644
index 0000000000..1cb45aef8c
--- /dev/null
+++ b/aosp_diff/preliminary/packages/apps/Camera2/04_0004-WA-Reorder-preference-in-settings.patch
@@ -0,0 +1,83 @@
+From 512988758ddc8cdfb15a87ff034e5ce2b3755e57 Mon Sep 17 00:00:00 2001
+From: NaveenVenturi1203 <venturi.naveen@intel.com>
+Date: Fri, 8 Nov 2024 08:15:22 +0000
+Subject: [PATCH] Reorder Preference Screen in Settings Activity
+
+Issue Detailed: First Preference Screen in Camera Settings Activity is
+not getting displayed leading to resolution& quality screen not getting
+displayed.
+
+Issue Fixed: Reordered the Preference Screen to display Advanced
+Preference Screen first by forcefully enabling Advanced
+Preference Screen.
+
+Tested-On: Checked Resolution Screen is displayed in AOSP Camera
+Settings
+
+Tracked-On: OAM-127026
+
+Signed-off-by: NaveenVenturi1203 <venturi.naveen@intel.com>
+---
+ res/xml/camera_preferences.xml                | 23 +++++++++----------
+ .../settings/CameraSettingsActivity.java      |  6 +++++
+ 2 files changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
+index 9c2a1a274..38845b938 100644
+--- a/res/xml/camera_preferences.xml
++++ b/res/xml/camera_preferences.xml
+@@ -18,6 +18,17 @@
+ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+         android:key="prefscreen_top">
+ 
++  <!-- Advanced -->
++  <PreferenceScreen
++      android:key="pref_category_advanced"
++      android:title="@string/pref_category_advanced" >
++    <!-- Exposure Compensation -->
++    <com.android.camera.settings.ManagedSwitchPreference
++        android:defaultValue="false"
++        android:key="pref_camera_exposure_compensation_key"
++        android:title="@string/pref_camera_exposure_compensation" />
++  </PreferenceScreen>
++
+   <!-- Resolutions and Quality -->
+   <PreferenceScreen
+       android:key="pref_category_resolution"
+@@ -59,16 +70,4 @@
+       android:defaultValue="false"
+       android:key="pref_camera_recordlocation_key"
+       android:title="@string/pref_camera_save_location_title" />
+-
+-  <!-- Advanced -->
+-  <PreferenceScreen
+-      android:key="pref_category_advanced"
+-      android:title="@string/pref_category_advanced" >
+-    <!-- Exposure Compensation -->
+-    <com.android.camera.settings.ManagedSwitchPreference
+-        android:defaultValue="false"
+-        android:key="pref_camera_exposure_compensation_key"
+-        android:title="@string/pref_camera_exposure_compensation" />
+-  </PreferenceScreen>
+-
+ </PreferenceScreen>
+diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java
+index 6c76e961c..c6166bf96 100644
+--- a/src/com/android/camera/settings/CameraSettingsActivity.java
++++ b/src/com/android/camera/settings/CameraSettingsActivity.java
+@@ -114,6 +114,12 @@ public class CameraSettingsActivity extends FragmentActivity {
+             fatalErrorHandler.onGenericCameraAccessFailure();
+         }
+ 
++        /*First Preference Screen is not getting displayed
++	 *so to avoid not displaying the Resolution Preference Screen,Adavanced Preference screen is forcefully enabled
++	 */
++
++        hideAdvancedScreen = false;
++
+         ActionBar actionBar = getActionBar();
+         actionBar.setDisplayHomeAsUpEnabled(true);
+         actionBar.setTitle(R.string.mode_settings);
+-- 
+2.34.1
+