PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 02930093: Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40

Browse Source 
Merge commit '0293009389eb3a4e8a3f2d08060e864f53f3c532' into gingerbread-plus-aosp

* commit '0293009389eb3a4e8a3f2d08060e864f53f3c532':
  Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
This commit is contained in:
Dianne Hackborn
2010-09-02 19:02:47 -07:00
committed by Android Git Automerger
parent 6e6d05801e 0293009389
commit 356102e39a
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1884,8 +1884,6 @@ found in the list of installed applications.</string>
<string name="testing_phone_info">Phone information</string> <string name="testing_phone_info">Phone information</string>
<!-- In the Testing screen. The item title of the activity that shows a bunch of battery-related information. --> <!-- In the Testing screen. The item title of the activity that shows a bunch of battery-related information. -->
<string name="testing_battery_info">Battery information</string> <string name="testing_battery_info">Battery information</string>
<!-- In the Testing screen. The item title of the activity that shows a bunch of historical battery-related information. -->
<string name="testing_battery_history">Battery history</string>
<!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations. --> <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations. -->
<string name="testing_sim_toolkit">SIM toolkit</string> <string name="testing_sim_toolkit">SIM toolkit</string>

7
res/xml/testing_settings.xml
View File

@@ -32,13 +32,6 @@
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen
android:title="@string/testing_battery_history">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.battery_history.BatteryHistory" />
</PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:title="@string/testing_usage_stats"> android:title="@string/testing_usage_stats">
<intent android:action="android.intent.action.MAIN" <intent android:action="android.intent.action.MAIN"