Skip to content

Commit 61926db

Browse files
committed
修复默认覆盖问题
1 parent 6c65ed2 commit 61926db

5 files changed

Lines changed: 11 additions & 13 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.0'
8+
classpath 'com.android.tools.build:gradle:2.2.2'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

filepicker/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<application
88
android:allowBackup="true"
9-
android:label="@string/app_name"
109
android:supportsRtl="true">
1110

1211
<activity

filepicker/src/main/res/values-zh/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_name">FilePicker</string>
43
<string name="confirm">确定</string>
54
<string name="no_video_play_app">没有可用的视频播放应用</string>
65
<string name="record_audio">录音</string>

filepicker/src/main/res/values/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<resources>
2-
<string name="app_name">FilePicker</string>
32
<string name="confirm">Done</string>
43
<string name="no_video_play_app">No App exists for camera!</string>
54
<string name="record_audio">Record Audio</string>

gradle.properties

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
# Project-wide Gradle settings.
2-
3-
# IDE (e.g. Android Studio) users:
4-
# Gradle settings configured through the IDE *will override*
5-
# any settings specified in this file.
6-
1+
## Project-wide Gradle settings.
2+
#
73
# For more details on how to configure your build environment visit
84
# http://www.gradle.org/docs/current/userguide/build_environment.html
9-
5+
#
106
# Specifies the JVM arguments used for the daemon process.
117
# The setting is particularly useful for tweaking memory settings.
12-
org.gradle.jvmargs=-Xmx1536m
13-
8+
# Default value: -Xmx1024m -XX:MaxPermSize=256m
9+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
10+
#
1411
# When configured, Gradle will run in incubating parallel mode.
1512
# This option should only be used with decoupled projects. More details, visit
1613
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1714
# org.gradle.parallel=true
15+
#Sun Dec 11 02:24:29 CST 2016
16+
systemProp.http.proxyHost=vt-hk1.vnet.link
17+
org.gradle.jvmargs=-Xmx1536m
18+
systemProp.http.proxyPort=30030

0 commit comments

Comments
 (0)