Android 14 大屏设备显示NavigationBar

时间:2024-10-08 10:35:42

Android 14大屏设备显示NavigationBar

在这里插入图片描述

---
 frameworks/base/core/res/res/values/                     | 4 ++--
 .../com/android/systemui/shared/recents/utilities/   | 4 ++++
 .../apps/Launcher3/quickstep/res/xml/indexable_launcher_prefs.xml  | 2 +-
 .../src/com/android/launcher3/taskbar/          | 5 +++++
 packages/apps/Launcher3/res/layout/                    | 1 +
 packages/apps/Launcher3/res/xml/launcher_preferences.xml           | 2 +-
 .../apps/Launcher3/src/com/android/launcher3/    | 7 +++++++
 .../Launcher3/src/com/android/launcher3/states/ | 6 +++++-
 .../src/com/android/launcher3/util/          | 6 +++++-
 .../src/com/android/launcher3/util/window/  | 7 +++++++
 .../apps/SearchLauncher/res/xml/launcher_preferences.xml           | 2 +-
 11 files changed, 39 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 frameworks/base/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/
 mode change 100644 => 100755 packages/apps/Launcher3/quickstep/res/xml/indexable_launcher_prefs.xml
 mode change 100644 => 100755 packages/apps/Launcher3/res/layout/
 mode change 100644 => 100755 packages/apps/Launcher3/src/com/android/launcher3/states/
 mode change 100644 => 100755 packages/apps/Launcher3/src/com/android/launcher3/util/
 mode change 100644 => 100755 packages/apps/Launcher3/src/com/android/launcher3/util/window/
 mode change 100644 => 100755 vendor/partner_gms/apps/SearchLauncher/res/xml/launcher_preferences.xml

diff --git a/frameworks/base/core/res/res/values/ b/frameworks/base/core/res/res/values/
index 5c62804..254bc7e 100755
--- a/frameworks/base/core/res/res/values/
+++ b/frameworks/base/core/res/res/values/
@@ -2482,8 +2482,8 @@
     <integer name="config_motionPredictionOffsetNanos">0</integer>
 
     <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
-         autodetected from the Configuration. -->
-    <bool name="config_showNavigationBar">false</bool>
+         autodetected from the Configuration. yim mod-->
+    <bool name="config_showNavigationBar">true</bool>
 
     <!-- Whether action menu items should be displayed in ALLCAPS or not.
          Defaults to true. If this is not appropriate for specific locales
diff --git a/frameworks/base/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/ b/frameworks/base/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/
old mode 100644
new mode 100755
index 751a3f8..4a832f5
--- a/frameworks/base/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/
+++ b/frameworks/base/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/
@@ -31,6 +31,7 @@ import ;
 import ;
 import ;
 import ;
+import ;	//yim mod
 
 /* Common code */
 public class Utilities {
@@ -138,6 +139,9 @@ public class Utilities {
     /** @return whether or not {@param context} represents that of a large screen device or not */
     @TargetApi(Build.VERSION_CODES.R)
     public static boolean isLargeScreen(Context context) {
+        if (("","0").equals("0")){
+            return false;	//yim mod
+        }
         final WindowManager windowManager = ();
         final Rect bounds = ().getBounds();
 
diff --git a/packages/apps/Launcher3/quickstep/res/xml/indexable_launcher_prefs.xml b/packages/apps/Launcher3/quickstep/res/xml/indexable_launcher_prefs.xml
old mode 100644
new mode 100755
index b4740e5..aa1fd4d
--- a/packages/apps/Launcher3/quickstep/res/xml/indexable_launcher_prefs.xml
+++ b/packages/apps/Launcher3/quickstep/res/xml/indexable_launcher_prefs.xml
@@ -26,7 +26,7 @@
         android:key="pref_allowRotation"
         android:title="@string/allow_rotation_title"
         android:summary="@string/allow_rotation_desc"
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:persistent="true" />
 
 </PreferenceScreen>
diff --git a/packages/apps/Launcher3/quickstep/src/com/android/launcher3/taskbar/ b/packages/apps/Launcher3/quickstep/src/com/android/launcher3/taskbar/
index 8c3e831..a61fc4a 100755
--- a/packages/apps/Launcher3/quickstep/src/com/android/launcher3/taskbar/
+++ b/packages/apps/Launcher3/quickstep/src/com/android/launcher3/taskbar/
@@ -382,6 +382,11 @@ public class TaskbarManager {
                 (mContext).getDeviceProfile(mContext) : null;
 
         destroyExistingTaskbar();
+		//yim mod
+        if (("","0").equals("0")){
+            return;
+        }
+		//end
 
         boolean isTaskbarEnabled = dp != null && isTaskbarPresent(dp);
         debugWhyTaskbarNotDestroyed("recreateTaskbar: isTaskbarEnabled=" + isTaskbarEnabled
diff --git a/packages/apps/Launcher3/res/layout/ b/packages/apps/Launcher3/res/layout/
old mode 100644
new mode 100755
index a709fbc..84d05bc
--- a/packages/apps/Launcher3/res/layout/
+++ b/packages/apps/Launcher3/res/layout/
@@ -26,6 +26,7 @@
         android:layout_height="match_parent"
         android:clipChildren="false"
         android:clipToPadding="false"
+        android:layout_marginBottom="@*android:dimen/navigation_bar_height"
         android:importantForAccessibility="no">
 
         <.
diff --git a/packages/apps/Launcher3/res/xml/launcher_preferences.xml b/packages/apps/Launcher3/res/xml/launcher_preferences.xml
index cb47846..d5497a0 100755
--- a/packages/apps/Launcher3/res/xml/launcher_preferences.xml
+++ b/packages/apps/Launcher3/res/xml/launcher_preferences.xml
@@ -45,7 +45,7 @@
         android:key="pref_allowRotation"
         android:title="@string/allow_rotation_title"
         android:summary="@string/allow_rotation_desc"
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:persistent="true"
         launcher:logIdOn="615"
         launcher:logIdOff="616" />
diff --git a/packages/apps/Launcher3/src/com/android/launcher3/ b/packages/apps/Launcher3/src/com/android/launcher3/
index b5a70e5..8f835b5 100755
--- a/packages/apps/Launcher3/src/com/android/launcher3/
+++ b/packages/apps/Launcher3/src/com/android/launcher3/
@@ -65,6 +65,8 @@ import .launcher3.UniLauncher3Factory;
 import ;
 import ;
 import ;
+import ;//yim mod
+
 
 @SuppressLint("NewApi")
 public class DeviceProfile {
@@ -1522,6 +1524,11 @@ public class DeviceProfile {
      * the hotseat is on the bottom row.
      */
     public boolean isVerticalBarLayout() {
+
+	   if (("","0").equals("0")){
+			return false;   //yim mod
+	   }
+
         return isLandscape && transposeLayoutWithOrientation;
     }
 
diff --git a/packages/apps/Launcher3/src/com/android/launcher3/states/ b/packages/apps/Launcher3/src/com/android/launcher3/states/
old mode 100644
new mode 100755
index 7b4e248..5becef3
--- a/packages/apps/Launcher3/src/com/android/launcher3/states/
+++ b/packages/apps/Launcher3/src/com/android/launcher3/states/
@@ -38,6 +38,7 @@ import ;
 import .;
 import .;
 import .;
+import ;//yim mod
 
 /**
  * Utility class to manage launcher rotation
@@ -55,7 +56,10 @@ public class RotationHelper implements OnSharedPreferenceChangeListener,
         // original dimensions to determine if rotation is allowed of not.
         float originalSmallestWidth = dpiFromPx((, ),
                 DENSITY_DEVICE_STABLE);
-        return originalSmallestWidth >= MIN_TABLET_WIDTH;
+		if (("","0").equals("0")){
+            return true;	//yim mod
+        }
+		return originalSmallestWidth >= MIN_TABLET_WIDTH;
     }
 
     public static final int REQUEST_NONE = 0;
diff --git a/packages/apps/Launcher3/src/com/android/launcher3/util/ b/packages/apps/Launcher3/src/com/android/launcher3/util/
old mode 100644
new mode 100755
index 621a1ca..b050fb6
--- a/packages/apps/Launcher3/src/com/android/launcher3/util/
+++ b/packages/apps/Launcher3/src/com/android/launcher3/util/
@@ -60,6 +60,7 @@ import ;
 import ;
 import ;
 import ;
+import ;//yim mod
 
 /**
  * Utility class to cache properties of default display to avoid a system RPC on every call.
@@ -432,7 +433,10 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
          * Returns {@code true} if the bounds represent a tablet.
          */
         public boolean isTablet(WindowBounds bounds) {
-            return smallestSizeDp(bounds) >= MIN_TABLET_WIDTH;
+			if (("","0").equals("0")){
+            	return false;	//yim mod
+        	}
+			return smallestSizeDp(bounds) >= MIN_TABLET_WIDTH;
         }
 
         /**
diff --git a/packages/apps/Launcher3/src/com/android/launcher3/util/window/ b/packages/apps/Launcher3/src/com/android/launcher3/util/window/
old mode 100644
new mode 100755
index 4093bc9..4730c79
--- a/packages/apps/Launcher3/src/com/android/launcher3/util/window/
+++ b/packages/apps/Launcher3/src/com/android/launcher3/util/window/
@@ -56,6 +56,7 @@ import .;
 import .;
 import .;
 import .;
+import ;//yim mod
 
 /**
  * Utility class for mocking some window manager behaviours
@@ -146,6 +147,9 @@ public class WindowManagerProxy implements ResourceBasedOverride {
         Configuration config = ();
 
         boolean isTablet =  > MIN_TABLET_WIDTH;
+		if(("","0").equals("0")){
+            	isTablet = false;	//yim mod
+        }
         boolean isGesture = isGestureNav(context);
         boolean isPortrait =  > ;
 
@@ -216,6 +220,9 @@ public class WindowManagerProxy implements ResourceBasedOverride {
         }
 
         boolean isTablet = swDp >= MIN_TABLET_WIDTH;
+		if(("","0").equals("0")){
+            	isTablet = false;	//yim mod
+        }
         boolean isTabletOrGesture = isTablet
                 || (Utilities.ATLEAST_R && isGestureNav(context));
 
diff --git a/vendor/partner_gms/apps/SearchLauncher/res/xml/launcher_preferences.xml b/vendor/partner_gms/apps/SearchLauncher/res/xml/launcher_preferences.xml
old mode 100644
new mode 100755
index 39341f9..73886d0
--- a/vendor/partner_gms/apps/SearchLauncher/res/xml/launcher_preferences.xml
+++ b/vendor/partner_gms/apps/SearchLauncher/res/xml/launcher_preferences.xml
@@ -50,7 +50,7 @@
         android:title="@string/title_show_google_app"/>
 
     <SwitchPreference
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:key="pref_allowRotation"
         android:persistent="true"
         android:summary="@string/allow_rotation_desc"
-- 
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18
  • 19
  • 20
  • 21
  • 22
  • 23
  • 24
  • 25
  • 26
  • 27
  • 28
  • 29
  • 30
  • 31
  • 32
  • 33
  • 34
  • 35
  • 36
  • 37
  • 38
  • 39
  • 40
  • 41
  • 42
  • 43
  • 44
  • 45
  • 46
  • 47
  • 48
  • 49
  • 50
  • 51
  • 52
  • 53
  • 54
  • 55
  • 56
  • 57
  • 58
  • 59
  • 60
  • 61
  • 62
  • 63
  • 64
  • 65
  • 66
  • 67
  • 68
  • 69
  • 70
  • 71
  • 72
  • 73
  • 74
  • 75
  • 76
  • 77
  • 78
  • 79
  • 80
  • 81
  • 82
  • 83
  • 84
  • 85
  • 86
  • 87
  • 88
  • 89
  • 90
  • 91
  • 92
  • 93
  • 94
  • 95
  • 96
  • 97
  • 98
  • 99
  • 100
  • 101
  • 102
  • 103
  • 104
  • 105
  • 106
  • 107
  • 108
  • 109
  • 110
  • 111
  • 112
  • 113
  • 114
  • 115
  • 116
  • 117
  • 118
  • 119
  • 120
  • 121
  • 122
  • 123
  • 124
  • 125
  • 126
  • 127
  • 128
  • 129
  • 130
  • 131
  • 132
  • 133
  • 134
  • 135
  • 136
  • 137
  • 138
  • 139
  • 140
  • 141
  • 142
  • 143
  • 144
  • 145
  • 146
  • 147
  • 148
  • 149
  • 150
  • 151
  • 152
  • 153
  • 154
  • 155
  • 156
  • 157
  • 158
  • 159
  • 160
  • 161
  • 162
  • 163
  • 164
  • 165
  • 166
  • 167
  • 168
  • 169
  • 170
  • 171
  • 172
  • 173
  • 174
  • 175
  • 176
  • 177
  • 178
  • 179
  • 180
  • 181
  • 182
  • 183
  • 184
  • 185
  • 186
  • 187
  • 188
  • 189
  • 190
  • 191
  • 192
  • 193
  • 194
  • 195
  • 196
  • 197
  • 198
  • 199
  • 200
  • 201
  • 202
  • 203
  • 204
  • 205
  • 206
  • 207
  • 208
  • 209
  • 210
  • 211
  • 212
  • 213
  • 214
  • 215
  • 216
  • 217
  • 218
  • 219
  • 220
  • 221
  • 222
  • 223
  • 224
  • 225
  • 226
  • 227
  • 228
  • 229
  • 230
  • 231
  • 232
  • 233
  • 234
  • 235
  • 236
  • 237
  • 238
  • 239
  • 240
  • 241
  • 242
  • 243
  • 244
  • 245

备注确认 =0