Skip to content

Commit 843ac1a

Browse files
committed
see 04/27 log
1 parent 5a1abb5 commit 843ac1a

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

app/src/main/res_core/layout/activity_flashlight.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
android:layout_height="wrap_content" />
1515

1616
<Button
17-
android:id="@+id/btn_open_flashlight"
17+
android:id="@+id/btn_set_flashlight_on"
1818
style="@style/WideBtnStyle"
1919
android:layout_width="match_parent"
2020
android:layout_height="wrap_content"
21-
android:text="@string/flashlight_open" />
21+
android:text="@string/flashlight_on" />
2222

2323
<Button
24-
android:id="@+id/btn_close_flashlight"
24+
android:id="@+id/btn_set_flashlight_off"
2525
style="@style/WideBtnStyle"
2626
android:layout_width="match_parent"
2727
android:layout_height="wrap_content"
28-
android:text="@string/flashlight_close" />
28+
android:text="@string/flashlight_off" />
2929

3030
</LinearLayout>

app/src/main/res_sub/layout/activity_util_sub.xml

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
43
android:layout_width="match_parent"
54
android:layout_height="wrap_content"
65
android:gravity="center_horizontal"
76
android:orientation="vertical"
87
android:paddingLeft="@dimen/spacing_16"
98
android:paddingRight="@dimen/spacing_16">
109

11-
<!--<Button-->
12-
<!--style="@style/BtnFont"-->
13-
<!--android:layout_width="match_parent"-->
14-
<!--android:layout_height="wrap_content"-->
15-
<!--android:onClick="flashlightClick"-->
16-
<!--android:text="@string/demo_flashlight"-->
17-
<!--/>-->
18-
1910
<Button
2011
style="@style/WideBtnStyle"
2112
android:layout_width="match_parent"
2213
android:layout_height="wrap_content"
2314
android:onClick="brightnessClick"
2415
android:text="@string/demo_brightness" />
2516

17+
<Button
18+
style="@style/WideBtnStyle"
19+
android:layout_width="match_parent"
20+
android:layout_height="wrap_content"
21+
android:onClick="flashlightClick"
22+
android:text="@string/demo_flashlight" />
23+
2624
<Button
2725
style="@style/WideBtnStyle"
2826
android:layout_width="match_parent"

app/src/main/res_sub/values/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<string name="brightness_set_auto_brightness_disable">Set Auto Brightness Disable</string>
1111

1212
<!-- Flashlight相关 -->
13-
<string name="flashlight_open">Open Flashlight</string>
14-
<string name="flashlight_close">Close Flashlight</string>
13+
<string name="flashlight_on">Set Flashlight On</string>
14+
<string name="flashlight_off">Set Flashlight Off</string>
1515

1616

1717
</resources>

0 commit comments

Comments
 (0)