From ddcd9a450e5ba65f91fa579827ea37dee923ba01 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@QQ.COM>
Date: Sun, 14 Dec 2025 19:19:13 +0800
Subject: [PATCH] 20251214_191909_625

---
 powerbell/build.properties                    |   4 +-
 .../BackgroundSettingsActivity.java           |   8 +-
 .../layout/activity_background_settings.xml   | 210 +++++++++---------
 3 files changed, 109 insertions(+), 113 deletions(-)

diff --git a/powerbell/build.properties b/powerbell/build.properties
index 5ad38a9..18b8459 100644
--- a/powerbell/build.properties
+++ b/powerbell/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Dec 14 18:30:51 HKT 2025
+#Sun Dec 14 11:03:02 GMT 2025
 stageCount=6
 libraryProject=
 baseVersion=15.14
 publishVersion=15.14.5
-buildCount=0
+buildCount=8
 baseBetaVersion=15.14.6
diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java
index 33041b8..5032d47 100644
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java
@@ -3,7 +3,6 @@ package cc.winboll.studio.powerbell.activities;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
@@ -16,7 +15,7 @@ import android.os.Looper;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.view.View;
-import androidx.annotation.NonNull;
+import android.widget.LinearLayout;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.FileProvider;
@@ -768,10 +767,11 @@ public class BackgroundSettingsActivity extends WinBoLLActivity {
 
         if (putUriFileToPreviewSource(selectedImage)) {
             LogUtils.d(TAG, "【选图同步】路径绑定完成");
+			LinearLayout ll_maincontent = findViewById(R.id.ll_maincontent);
             ImageCropUtils.startImageCrop(BackgroundSettingsActivity.this,
 										  mBgSourceUtils.getPreviewBackgroundBean(),
-										  mBackgroundView.getWidth(),
-										  mBackgroundView.getHeight(),
+										  ll_maincontent.getWidth(),
+										  ll_maincontent.getHeight(),
 										  false,
 										  REQUEST_CROP_IMAGE
 										  );
diff --git a/powerbell/src/main/res/layout/activity_background_settings.xml b/powerbell/src/main/res/layout/activity_background_settings.xml
index 1f3911c..4a2fe79 100644
--- a/powerbell/src/main/res/layout/activity_background_settings.xml
+++ b/powerbell/src/main/res/layout/activity_background_settings.xml
@@ -14,131 +14,127 @@
 		style="@style/DefaultAToolbar"/>
 
 	<LinearLayout
-		android:orientation="vertical"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent">
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/ll_maincontent"
+		android:background="#FF91B620">
 
 		<RelativeLayout
 			android:layout_width="match_parent"
 			android:layout_height="match_parent">
 
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="match_parent">
-
-				<cc.winboll.studio.powerbell.views.BackgroundView
-					xmlns:app="http://schemas.android.com/apk/res-auto"
-					android:orientation="vertical"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:id="@+id/background_view">
-
-				</cc.winboll.studio.powerbell.views.BackgroundView>
-
-			</LinearLayout>
-
-			<LinearLayout
+			<cc.winboll.studio.powerbell.views.BackgroundView
+				xmlns:app="http://schemas.android.com/apk/res-auto"
 				android:orientation="vertical"
 				android:layout_width="match_parent"
-				android:layout_height="400dp">
+				android:layout_height="match_parent"
+				android:id="@+id/background_view">
 
-				<RelativeLayout
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content">
-
-					<cc.winboll.studio.libaes.views.AButton
-						android:layout_width="160dp"
-						android:layout_height="36dp"
-						android:text="Origin BG"
-						android:id="@+id/activitybackgroundpictureAButton5"
-						android:layout_alignParentLeft="true"
-						android:layout_margin="5dp"/>
-
-					<cc.winboll.studio.libaes.views.AButton
-						android:layout_width="160dp"
-						android:layout_height="36dp"
-						android:text="Received BG"
-						android:id="@+id/activitybackgroundpictureAButton4"
-						android:layout_alignParentRight="true"
-						android:layout_margin="5dp"/>
-
-				</RelativeLayout>
 
 				<LinearLayout
-					android:orientation="horizontal"
+					android:orientation="vertical"
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="right">
+					android:layout_height="400dp">
 
-					<cc.winboll.studio.libaes.views.AButton
-						android:layout_width="50dp"
-						android:layout_height="36dp"
-						android:text="◎"
-						android:layout_gravity="center_vertical"
-						android:layout_margin="5dp"
-						android:id="@+id/activitybackgroundpictureAButton1"/>
+					<RelativeLayout
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content">
 
-					<cc.winboll.studio.libaes.views.AButton
-						android:layout_width="50dp"
-						android:layout_height="36dp"
-						android:text="☑"
-						android:layout_gravity="center_vertical"
-						android:layout_margin="5dp"
-						android:id="@+id/activitybackgroundpictureAButton2"/>
+						<cc.winboll.studio.libaes.views.AButton
+							android:layout_width="160dp"
+							android:layout_height="36dp"
+							android:text="Origin BG"
+							android:id="@+id/activitybackgroundpictureAButton5"
+							android:layout_alignParentLeft="true"
+							android:layout_margin="5dp"/>
 
-					<cc.winboll.studio.libaes.views.AButton
-						android:layout_width="50dp"
-						android:layout_height="36dp"
-						android:text="♾"
-						android:layout_gravity="center_vertical"
-						android:layout_margin="5dp"
-						android:id="@+id/activitybackgroundpictureAButton9"
-						android:onClick="onNetworkBackgroundDialog"/>
+						<cc.winboll.studio.libaes.views.AButton
+							android:layout_width="160dp"
+							android:layout_height="36dp"
+							android:text="Received BG"
+							android:id="@+id/activitybackgroundpictureAButton4"
+							android:layout_alignParentRight="true"
+							android:layout_margin="5dp"/>
+
+					</RelativeLayout>
+
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:gravity="right">
+
+						<cc.winboll.studio.libaes.views.AButton
+							android:layout_width="50dp"
+							android:layout_height="36dp"
+							android:text="◎"
+							android:layout_gravity="center_vertical"
+							android:layout_margin="5dp"
+							android:id="@+id/activitybackgroundpictureAButton1"/>
+
+						<cc.winboll.studio.libaes.views.AButton
+							android:layout_width="50dp"
+							android:layout_height="36dp"
+							android:text="☑"
+							android:layout_gravity="center_vertical"
+							android:layout_margin="5dp"
+							android:id="@+id/activitybackgroundpictureAButton2"/>
+
+						<cc.winboll.studio.libaes.views.AButton
+							android:layout_width="50dp"
+							android:layout_height="36dp"
+							android:text="♾"
+							android:layout_gravity="center_vertical"
+							android:layout_margin="5dp"
+							android:id="@+id/activitybackgroundpictureAButton9"
+							android:onClick="onNetworkBackgroundDialog"/>
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:gravity="right">
+
+						<cc.winboll.studio.libaes.views.AButton
+							android:layout_width="50dp"
+							android:layout_height="36dp"
+							android:text="[+]"
+							android:layout_gravity="center_vertical"
+							android:layout_margin="5dp"
+							android:id="@+id/activitybackgroundpictureAButton3"/>
+
+						<cc.winboll.studio.libaes.views.AButton
+							android:layout_width="50dp"
+							android:layout_height="36dp"
+							android:text="[+~]"
+							android:layout_gravity="center_vertical"
+							android:layout_margin="5dp"
+							android:id="@+id/activitybackgroundpictureAButton6"/>
+
+						<cc.winboll.studio.libaes.views.AButton
+							android:layout_width="50dp"
+							android:layout_height="36dp"
+							android:text="[◐]"
+							android:layout_gravity="center_vertical"
+							android:layout_margin="5dp"
+							android:id="@+id/activitybackgroundpictureAButton7"/>
+
+						<cc.winboll.studio.libaes.views.AButton
+							android:layout_width="50dp"
+							android:layout_height="36dp"
+							android:text="[○]"
+							android:layout_gravity="center_vertical"
+							android:layout_margin="5dp"
+							android:id="@+id/activitybackgroundpictureAButton8"/>
+
+					</LinearLayout>
 
 				</LinearLayout>
 
-				<LinearLayout
-					android:orientation="horizontal"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="right">
-
-					<cc.winboll.studio.libaes.views.AButton
-						android:layout_width="50dp"
-						android:layout_height="36dp"
-						android:text="[+]"
-						android:layout_gravity="center_vertical"
-						android:layout_margin="5dp"
-						android:id="@+id/activitybackgroundpictureAButton3"/>
-
-					<cc.winboll.studio.libaes.views.AButton
-						android:layout_width="50dp"
-						android:layout_height="36dp"
-						android:text="[+~]"
-						android:layout_gravity="center_vertical"
-						android:layout_margin="5dp"
-						android:id="@+id/activitybackgroundpictureAButton6"/>
-
-					<cc.winboll.studio.libaes.views.AButton
-						android:layout_width="50dp"
-						android:layout_height="36dp"
-						android:text="[◐]"
-						android:layout_gravity="center_vertical"
-						android:layout_margin="5dp"
-						android:id="@+id/activitybackgroundpictureAButton7"/>
-
-					<cc.winboll.studio.libaes.views.AButton
-						android:layout_width="50dp"
-						android:layout_height="36dp"
-						android:text="[○]"
-						android:layout_gravity="center_vertical"
-						android:layout_margin="5dp"
-						android:id="@+id/activitybackgroundpictureAButton8"/>
-
-				</LinearLayout>
-
-			</LinearLayout>
-
+			</cc.winboll.studio.powerbell.views.BackgroundView>
 		</RelativeLayout>
 
 	</LinearLayout>