liuzhenxing1118 3 years ago
parent
commit
f144d685f8

+ 4 - 0
.idea/misc.xml

@@ -3,8 +3,11 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="../../../.gradle/caches/transforms-3/816ef70ee883c3b31320bc09b1356673/transformed/xplibcommon/res/drawable/selector_seekbar_bg.xml" value="0.1" />
         <entry key="../../../.gradle/caches/transforms-3/dae954c5fd9608ef94a7528c5de015a2/transformed/xplibcommon/res/drawable/selector_switch_thumb.xml" value="0.12" />
+        <entry key="../../../.gradle/caches/transforms-3/e72acc6db89adf91a5f1ea627e4e83d1/transformed/xplibcommon/res/drawable/selector_seekbar_bg.xml" value="0.156" />
         <entry key="app/src/main/res/drawable-xhdpi/button_shape.xml" value="0.124" />
+        <entry key="app/src/main/res/drawable-xhdpi/selector_seekbar_bg.xml" value="0.1" />
         <entry key="app/src/main/res/drawable/view_shape.xml" value="0.112" />
         <entry key="app/src/main/res/drawable/xp_checkbox.xml" value="0.112" />
         <entry key="app/src/main/res/layout/activity_action.xml" value="0.379981884057971" />
@@ -47,6 +50,7 @@
         <entry key="app/src/main/res/layout/item_title_subtitle.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_wifi_switch.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_xpstyle.xml" value="0.16055045871559634" />
+        <entry key="app/src/main/res/layout/selector_seekbar_bg.xml" value="0.15896739130434784" />
         <entry key="app/src/main/res/layout/software_version_activity.xml" value="0.20199275362318841" />
         <entry key="app/src/main/res/layout/view_cancel_sure.xml" value="0.34054107666015626" />
         <entry key="app/src/main/res/layout/view_content.xml" value="0.19300911854103345" />

+ 0 - 1
app/build.gradle

@@ -42,7 +42,6 @@ if(SDK_DIR == null) {
 }
 
 dependencies {
-
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

BIN
app/libs/xplibcommon.aar


+ 2 - 0
app/src/main/java/com/xplora/xpsettings/Data/DataManager.java

@@ -86,6 +86,8 @@ public class DataManager extends Application {
 
     public static void setBrightness(int value) {
         Log.d(TAG, "setBrightness: " + value);
+        if (Macros.DEBUG)
+            return;
         Settings.System.putInt(sContext.getContentResolver(), Settings.System.SCREEN_BRIGHTNESS, value * 255 / 100);
     }
 

+ 4 - 1
app/src/main/res/layout/activity_change_progress.xml

@@ -27,10 +27,13 @@
     <SeekBar
         android:id="@+id/seekbar"
         android:layout_width="match_parent"
-        android:layout_height="12dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
+        android:maxHeight="13dp"
+        android:thumb="@drawable/seekbar_thumb"
+        android:progressDrawable="@drawable/selector_seekbar_bg"
         />
 
 </LinearLayout>

+ 1 - 1
app/src/main/res/layout/activity_wifi_login.xml

@@ -54,7 +54,7 @@
 
     <android.inputmethodservice.KeyboardView
         android:id="@+id/main_keyview"
-        android:background="@color/xp_black"
+        android:background="@color/black"
         android:layout_width="match_parent"
         android:layout_height="140dp"
         android:focusable="true"