Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
石璀亮
/
system_info
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 30dbaa3b
authored
Aug 02, 2017
by
石璀亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(font):change chinese into xml
1 parent
216ba637
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
9 deletions
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/activity_model.xml
app/src/main/res/layout/activity_more.xml
app/src/main/res/values/strings.xml
app/src/main/res/layout/activity_main.xml
View file @
30dbaa3
...
...
@@ -22,17 +22,17 @@
>
<TableRow>
<TextView
android:text=
"
参数名称
"
android:text=
"
@string/layout_parameter
"
android:gravity=
"center"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
<TextView
android:text=
"
当前值
"
android:text=
"
@string/layout_current
"
android:gravity=
"center"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
<TextView
android:text=
"
出厂值
"
android:text=
"
@string/layout_default
"
android:gravity=
"center"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
...
...
app/src/main/res/layout/activity_model.xml
View file @
30dbaa3
...
...
@@ -20,7 +20,7 @@
android:id=
"@+id/choose_type"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"
选择其他型号
"
/>
android:text=
"
@string/layout_choose_other
"
/>
<LinearLayout
android:layout_width=
"wrap_content"
...
...
@@ -30,20 +30,20 @@
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
android:text=
"
确定
"
/>
android:text=
"
@string/layout_sure
"
/>
<Button
android:id=
"@+id/model_reset"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:text=
"
重置
"
/>
android:text=
"
@string/layout_reset
"
/>
<Button
android:id=
"@+id/model_clean"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:text=
"
清除
"
/>
android:text=
"
@string/layout_clean
"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/activity_more.xml
View file @
30dbaa3
...
...
@@ -18,12 +18,12 @@
android:orientation=
"horizontal"
>
<Button
android:id=
"@+id/sure"
android:text=
"
确认
"
android:text=
"
@string/layout_sure
"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
<Button
android:id=
"@+id/canecl"
android:text=
"
取消
"
android:text=
"
@string/layout_cancel
"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
...
...
app/src/main/res/values/strings.xml
View file @
30dbaa3
...
...
@@ -41,5 +41,13 @@
<string
name=
"alert_sure"
>
确定
</string>
<string
name=
"alert_cancel"
>
取消
</string>
<string
name=
"alert_type"
>
选择型号
</string>
<string
name=
"layout_parameter"
>
参数名称
</string>
<string
name=
"layout_current"
>
当前值
</string>
<string
name=
"layout_default"
>
出厂值
</string>
<string
name=
"layout_choose_other"
>
选择其他型号
</string>
<string
name=
"layout_sure"
>
确定
</string>
<string
name=
"layout_reset"
>
重置
</string>
<string
name=
"layout_clean"
>
清除
</string>
<string
name=
"layout_cancel"
>
取消
</string>
</resources>
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment