Skip to content

Commit 64114a5

Browse files
yuchuangu85yuchuangu85
committed
修改Launcher中的atrr属性中的iconSize为iconSize，避免和Material主题包中的iconSize一样导致不能编译
1 parent 769879f commit 64114a5

File tree

9 files changed

+24
-27
lines changed

9 files changed

+24
-27
lines changed

‎effectivecard/build.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,8 @@ android {
2424
}
2525

2626
repositories {
27-
maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }
28-
maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }
2927
mavenCentral()
3028
google()
31-
jcenter()
3229
}
3330

3431
dependencies {

‎floatwindow/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ android {
2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828

29-
implementation 'androidx.appcompat:appcompat:1.1.0'
29+
implementation 'androidx.appcompat:appcompat:1.2.0'
3030
implementation project(path: ':mxlibrary')
3131

32-
testImplementation 'junit:junit:4.12'
33-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
34-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
32+
testImplementation 'junit:junit:4.13.2'
33+
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
34+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
3535
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

‎launcherclient/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ android {
2424
}
2525

2626
repositories {
27-
maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }
28-
maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }
27+
// maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }
28+
// maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }
2929
mavenCentral()
3030
google()
3131
jcenter()

‎mxlibrary/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ android {
2323
}
2424

2525
repositories {
26-
maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }
27-
maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }
26+
// maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }
27+
// maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }
2828
mavenCentral()
2929
google()
3030
jcenter()

‎mxtheme/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ android {
2323
}
2424

2525
repositories {
26-
maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }
27-
maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }
26+
// maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }
27+
// maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }
2828
mavenCentral()
2929
google()
3030
jcenter()

‎res/values/attrs.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<!-- numHotseatIcons defaults to numColumns, if not specified -->
106106
<attr name="numHotseatIcons" format="integer"/>
107107

108-
<attr name="iconSize" format="float"/>
108+
<attr name="iconSizeL" format="float"/>
109109
<!-- landscapeIconSize defaults to iconSize, if not specified -->
110110
<attr name="landscapeIconSize" format="float"/>
111111
<attr name="iconTextSize" format="float"/>

‎res/xml/device_profiles.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
launcher:numColumns="3"
2626
launcher:numFolderRows="2"
2727
launcher:numFolderColumns="3"
28-
launcher:iconSize="48"
28+
launcher:iconSizeL="48"
2929
launcher:iconTextSize="13.0"
3030
launcher:numHotseatIcons="3"
3131
launcher:defaultLayoutId="@xml/default_workspace_3x3"
@@ -39,7 +39,7 @@
3939
launcher:numColumns="3"
4040
launcher:numFolderRows="3"
4141
launcher:numFolderColumns="3"
42-
launcher:iconSize="48"
42+
launcher:iconSizeL="48"
4343
launcher:iconTextSize="13.0"
4444
launcher:numHotseatIcons="3"
4545
launcher:defaultLayoutId="@xml/default_workspace_3x3"
@@ -53,7 +53,7 @@
5353
launcher:numColumns="4"
5454
launcher:numFolderRows="3"
5555
launcher:numFolderColumns="4"
56-
launcher:iconSize="48"
56+
launcher:iconSizeL="48"
5757
launcher:iconTextSize="13.0"
5858
launcher:numHotseatIcons="5"
5959
launcher:defaultLayoutId="@xml/default_workspace_4x4"
@@ -67,7 +67,7 @@
6767
launcher:numColumns="4"
6868
launcher:numFolderRows="3"
6969
launcher:numFolderColumns="4"
70-
launcher:iconSize="48"
70+
launcher:iconSizeL="48"
7171
launcher:iconTextSize="13.0"
7272
launcher:numHotseatIcons="5"
7373
launcher:defaultLayoutId="@xml/default_workspace_4x4"
@@ -81,7 +81,7 @@
8181
launcher:numColumns="4"
8282
launcher:numFolderRows="4"
8383
launcher:numFolderColumns="4"
84-
launcher:iconSize="48"
84+
launcher:iconSizeL="48"
8585
launcher:iconTextSize="13.0"
8686
launcher:numHotseatIcons="5"
8787
launcher:defaultLayoutId="@xml/default_workspace_4x4"
@@ -95,7 +95,7 @@
9595
launcher:numColumns="4"
9696
launcher:numFolderRows="4"
9797
launcher:numFolderColumns="4"
98-
launcher:iconSize="54"
98+
launcher:iconSizeL="54"
9999
launcher:iconTextSize="13.0"
100100
launcher:numHotseatIcons="5"
101101
launcher:defaultLayoutId="@xml/default_workspace_4x4"
@@ -109,7 +109,7 @@
109109
launcher:numColumns="4"
110110
launcher:numFolderRows="4"
111111
launcher:numFolderColumns="4"
112-
launcher:iconSize="54"
112+
launcher:iconSizeL="54"
113113
launcher:iconTextSize="13.0"
114114
launcher:numHotseatIcons="5"
115115
launcher:defaultLayoutId="@xml/default_workspace_4x4"
@@ -123,7 +123,7 @@
123123
launcher:numColumns="5"
124124
launcher:numFolderRows="4"
125125
launcher:numFolderColumns="4"
126-
launcher:iconSize="56"
126+
launcher:iconSizeL="56"
127127
launcher:iconTextSize="14.4"
128128
launcher:numHotseatIcons="5"
129129
launcher:defaultLayoutId="@xml/default_workspace_5x5"
@@ -137,7 +137,7 @@
137137
launcher:numColumns="6"
138138
launcher:numFolderRows="4"
139139
launcher:numFolderColumns="5"
140-
launcher:iconSize="64"
140+
launcher:iconSizeL="64"
141141
launcher:iconTextSize="14.4"
142142
launcher:numHotseatIcons="7"
143143
launcher:defaultLayoutId="@xml/default_workspace_5x6"
@@ -151,7 +151,7 @@
151151
launcher:numColumns="6"
152152
launcher:numFolderRows="4"
153153
launcher:numFolderColumns="5"
154-
launcher:iconSize="76"
154+
launcher:iconSizeL="76"
155155
launcher:iconTextSize="14.4"
156156
launcher:numHotseatIcons="7"
157157
launcher:defaultLayoutId="@xml/default_workspace_5x6"
@@ -165,7 +165,7 @@
165165
launcher:numColumns="7"
166166
launcher:numFolderRows="6"
167167
launcher:numFolderColumns="6"
168-
launcher:iconSize="100"
168+
launcher:iconSizeL="100"
169169
launcher:iconTextSize="20.0"
170170
launcher:numHotseatIcons="7"
171171
launcher:defaultLayoutId="@xml/default_workspace_5x6"

‎src/com/android/launcher3/InvariantDeviceProfile.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ ArrayList<InvariantDeviceProfile> getPredefinedDeviceProfiles(Context context) {
201201
Xml.asAttributeSet(parser), R.styleable.InvariantDeviceProfile);
202202
int numRows = a.getInt(R.styleable.InvariantDeviceProfile_numRows, 0);
203203
int numColumns = a.getInt(R.styleable.InvariantDeviceProfile_numColumns, 0);
204-
float iconSize = a.getFloat(R.styleable.InvariantDeviceProfile_iconSize, 0);
204+
float iconSize = a.getFloat(R.styleable.InvariantDeviceProfile_iconSizeL, 0);
205205
profiles.add(new InvariantDeviceProfile(
206206
a.getString(R.styleable.InvariantDeviceProfile_name),
207207
a.getFloat(R.styleable.InvariantDeviceProfile_minWidthDps, 0),

0 commit comments

Comments
 (0)