Android-x86
Fork

  • R/O
  • HTTP
  • SSH
  • HTTPS

packages-apps-Superuser: コミット

packages/apps/Superuser


コミットメタ情報

リビジョンcecfd70e9f2b838952f203cb784cc0de471441f4 (tree)
日時2011-11-23 06:20:11
作者Adam Shanks <chainsdd@gmai...>
コミッターAdam Shanks

ログメッセージ

Fix some build issues on ICS AOSP due to unlocalized strings

変更サマリ

差分

--- a/res/layout-large-port/activity_home.xml
+++ b/res/layout-large-port/activity_home.xml
@@ -39,7 +39,6 @@
3939 android:layout_width="match_parent"
4040 android:layout_height="64dp"
4141 android:paddingLeft="10dp"
42- android:text=">"
4342 android:textSize="22sp"
4443 android:textStyle="bold"
4544 android:textColor="#bebebe"
--- a/res/layout-v14/pin_layout.xml
+++ b/res/layout-v14/pin_layout.xml
@@ -39,13 +39,13 @@
3939 android:orientation="horizontal">
4040 <Button android:id="@+id/pin_1"
4141 style="@style/PinButton"
42- android:text="1" />
42+ android:text="@string/one" />
4343 <Button android:id="@+id/pin_2"
4444 style="@style/PinButton"
45- android:text="2" />
45+ android:text="@string/two" />
4646 <Button android:id="@+id/pin_3"
4747 style="@style/PinButton"
48- android:text="3" />
48+ android:text="@string/three" />
4949 </LinearLayout>
5050 <LinearLayout
5151 android:layout_width="match_parent"
@@ -53,13 +53,13 @@
5353 android:orientation="horizontal">
5454 <Button android:id="@+id/pin_4"
5555 style="@style/PinButton"
56- android:text="4" />
56+ android:text="@string/four" />
5757 <Button android:id="@+id/pin_5"
5858 style="@style/PinButton"
59- android:text="5" />
59+ android:text="@string/five" />
6060 <Button android:id="@+id/pin_6"
6161 style="@style/PinButton"
62- android:text="6" />
62+ android:text="@string/six" />
6363 </LinearLayout>
6464 <LinearLayout
6565 android:layout_width="match_parent"
@@ -67,13 +67,13 @@
6767 android:orientation="horizontal">
6868 <Button android:id="@+id/pin_7"
6969 style="@style/PinButton"
70- android:text="7" />
70+ android:text="@string/seven" />
7171 <Button android:id="@+id/pin_8"
7272 style="@style/PinButton"
73- android:text="8" />
73+ android:text="@string/eight" />
7474 <Button android:id="@+id/pin_9"
7575 style="@style/PinButton"
76- android:text="9" />
76+ android:text="@string/nine" />
7777 </LinearLayout>
7878 <LinearLayout
7979 android:layout_width="match_parent"
@@ -81,12 +81,12 @@
8181 android:orientation="horizontal">
8282 <Button android:id="@+id/pin_cancel"
8383 style="@style/PinButton"
84- android:text="Deny" />
84+ android:text="@string/deny" />
8585 <Button android:id="@+id/pin_0"
8686 style="@style/PinButton"
87- android:text="0" />
87+ android:text="@string/zero" />
8888 <Button android:id="@+id/pin_ok"
8989 style="@style/PinButton"
90- android:text="Allow" />
90+ android:text="@string/allow" />
9191 </LinearLayout>
9292 </LinearLayout>
--- a/res/layout/activity_pin.xml
+++ b/res/layout/activity_pin.xml
@@ -27,7 +27,7 @@
2727 <TextView
2828 android:layout_width="wrap_content"
2929 android:layout_height="wrap_content"
30- android:text="*#*#" />
30+ android:text="@string/before_secret_code" />
3131 <EditText android:id="@+id/secret_code"
3232 android:layout_width="wrap_content"
3333 android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
4242 <TextView
4343 android:layout_width="wrap_content"
4444 android:layout_height="wrap_content"
45- android:text="#*#*" />
45+ android:text="@string/after_secret_code" />
4646 </LinearLayout>
4747 <include layout="@layout/pin_layout" />
4848 </LinearLayout>
--- a/res/layout/fragment_app_list.xml
+++ b/res/layout/fragment_app_list.xml
@@ -26,7 +26,7 @@
2626 <TextView
2727 android:layout_width="wrap_content"
2828 android:layout_height="wrap_content"
29- android:text="Loading..." />
29+ android:text="@string/loading" />
3030 <ProgressBar
3131 style="@android:style/Widget.ProgressBar.Small"
3232 android:layout_width="wrap_content"
--- a/res/layout/more_options.xml
+++ b/res/layout/more_options.xml
@@ -23,7 +23,7 @@
2323 android:layout_width="match_parent"
2424 android:layout_height="wrap_content"
2525 android:paddingRight="10dp"
26- android:text="Use global settings" />
26+ android:text="@string/use_global_settings" />
2727 <LinearLayout
2828 android:layout_width="match_parent"
2929 android:layout_height="wrap_content"
@@ -34,11 +34,11 @@
3434 android:layout_width="match_parent"
3535 android:layout_height="wrap_content"
3636 android:enabled="false"
37- android:text="Notifications enabled" />
37+ android:text="@string/notifications_enabled" />
3838 <CheckBox android:id="@+id/check_logging"
3939 android:layout_width="match_parent"
4040 android:layout_height="wrap_content"
4141 android:enabled="false"
42- android:text="Logging enabled" />
42+ android:text="@string/logging_enabled" />
4343 </LinearLayout>
4444 </LinearLayout>
\ No newline at end of file
--- a/res/layout/pin_layout.xml
+++ b/res/layout/pin_layout.xml
@@ -39,13 +39,13 @@
3939 android:orientation="horizontal">
4040 <Button android:id="@+id/pin_1"
4141 style="@style/PinButton"
42- android:text="1" />
42+ android:text="@string/one" />
4343 <Button android:id="@+id/pin_2"
4444 style="@style/PinButton"
45- android:text="2" />
45+ android:text="@string/two" />
4646 <Button android:id="@+id/pin_3"
4747 style="@style/PinButton"
48- android:text="3" />
48+ android:text="@string/three" />
4949 </LinearLayout>
5050 <LinearLayout
5151 android:layout_width="match_parent"
@@ -53,13 +53,13 @@
5353 android:orientation="horizontal">
5454 <Button android:id="@+id/pin_4"
5555 style="@style/PinButton"
56- android:text="4" />
56+ android:text="@string/four" />
5757 <Button android:id="@+id/pin_5"
5858 style="@style/PinButton"
59- android:text="5" />
59+ android:text="@string/five" />
6060 <Button android:id="@+id/pin_6"
6161 style="@style/PinButton"
62- android:text="6" />
62+ android:text="@string/six" />
6363 </LinearLayout>
6464 <LinearLayout
6565 android:layout_width="match_parent"
@@ -67,13 +67,13 @@
6767 android:orientation="horizontal">
6868 <Button android:id="@+id/pin_7"
6969 style="@style/PinButton"
70- android:text="7" />
70+ android:text="@string/seven" />
7171 <Button android:id="@+id/pin_8"
7272 style="@style/PinButton"
73- android:text="8" />
73+ android:text="@string/eight" />
7474 <Button android:id="@+id/pin_9"
7575 style="@style/PinButton"
76- android:text="9" />
76+ android:text="@string/nine" />
7777 </LinearLayout>
7878 <LinearLayout
7979 android:layout_width="match_parent"
@@ -81,12 +81,12 @@
8181 android:orientation="horizontal">
8282 <Button android:id="@+id/pin_ok"
8383 style="@style/PinButton"
84- android:text="Allow" />
84+ android:text="@string/allow" />
8585 <Button android:id="@+id/pin_0"
8686 style="@style/PinButton"
87- android:text="0" />
87+ android:text="@string/zero" />
8888 <Button android:id="@+id/pin_cancel"
8989 style="@style/PinButton"
90- android:text="Deny" />
90+ android:text="@string/deny" />
9191 </LinearLayout>
9292 </LinearLayout>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -76,6 +76,21 @@
7676 <string name="detail_command">Command</string>
7777 <string name="detail_status">Status</string>
7878
79+ <string name="use_global_settings">Use global settings</string>
80+ <string name="notifications_enabled">Notifications enabled</string>
81+ <string name="logging_enabled">Logging enabled</string>
82+
83+ <string name="zero">0</string>
84+ <string name="one">1</string>
85+ <string name="two">2</string>
86+ <string name="three">3</string>
87+ <string name="four">4</string>
88+ <string name="five">5</string>
89+ <string name="six">6</string>
90+ <string name="seven">7</string>
91+ <string name="eight">8</string>
92+ <string name="nine">9</string>
93+
7994 <string name="request_message">%1$s is requesting Superuser access.\n\nWarning: If you did not initiate this action, or if you do not understand this request, it\'s generally a good idea to deny it.</string>
8095 <string name="request_more_info">Tap for more info</string>
8196 <string name="request_less_info">Tap for less info</string>
@@ -243,7 +258,11 @@
243258 <string name="malicious_app_uid">shares UID with Superuser</string>
244259 <string name="malicious_app_respond">requests respond permission</string>
245260 <string name="malicious_app_write">requests permission to write to permissions provider</string>
246-
261+
247262 <string name="changelog_full_title">Changelog</string>
248263 <string name="changelog_title">What\'s New</string>
264+
265+ <!-- Do not translate any strings below, they are here to prevent build errors -->
266+ <string name="before_secret_code">*#*#</string>
267+ <string name="after_secret_code">#*#*</string>
249268 </resources>
--- a/src/com/noshufou/android/su/widget/SlidingPanel.java
+++ b/src/com/noshufou/android/su/widget/SlidingPanel.java
@@ -71,6 +71,7 @@ public class SlidingPanel extends ViewGroup {
7171 @Override
7272 protected void onFinishInflate() {
7373 mButton = findViewById(mButtonId);
74+ ((Button)mButton).setText(">");
7475 if (mButton == null) {
7576 throw new IllegalArgumentException("The handle attribute must refer to a child");
7677 }
旧リポジトリブラウザで表示