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

am 8fb0ec36: UI improvements for "Battery use" app.

Browse Source 
Merge commit '8fb0ec36ec2f4cb8e0a48020b1b6e79b7f45635c'

* commit '8fb0ec36ec2f4cb8e0a48020b1b6e79b7f45635c':
  UI improvements for "Battery use" app.
This commit is contained in:
Amith Yamasani
2009-07-20 23:33:46 -07:00
committed by Android Git Automerger
parent 7f44ca3170 8fb0ec36ec
commit a459dbe5bb
5 changed files with 230 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
res/layout/power_usage_action_item.xml Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2009 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:paddingLeft="4dip"
android:focusable="true"
android:orientation="vertical"
android:paddingRight="?android:attr/scrollbarSize">
<TextView android:id="@+id/summary"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<!-- Spacer -->
<View
android:id="@+id/buttons_spacer_left"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="0.7"
android:visibility="invisible" />
<Button
android:id="@+id/action_button"
android:layout_width="150dip"
android:paddingRight="6dip"
android:layout_weight="0.3"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>

31
res/layout/power_usage_details.xml
View File

@@ -103,43 +103,18 @@
</LinearLayout>
<LinearLayout
android:id="@+id/controls_section"
android:id="@+id/controls"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/controls_section_title"
android:id="@+id/controls_title"
style="?android:attr/listSeparatorTextViewStyle"
android:layout_marginTop="6dip"
android:text="@string/controls_subtitle" />
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/action_button1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_marginRight="6dip"
android:layout_alignParentLeft="true"
android:layout_weight="1"/>
<Button
android:id="@+id/action_button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_marginRight="6dip"
android:layout_alignParentRight="true"
android:layout_weight="1"/>
</RelativeLayout>
<!-- Controls go here ... -->
</LinearLayout>

8
res/values/strings.xml
View File

@@ -1662,6 +1662,8 @@ found in the list of installed applications.</string>
<string name="battery_since_reset">Battery use since reset</string>
<!-- Battery usage duration -->
<string name="battery_stats_duration"><xliff:g id="time">%1$s</xliff:g> since unplugged</string>
<!-- Battery usage during last unplugged period -->
<string name="battery_stats_last_duration">@string/menu_stats_last_unplugged</string>
<!-- CPU awake time title -->
<string name="awake">Device awake time</string>
<!-- Wifi on time -->
@@ -1711,7 +1713,9 @@ found in the list of installed applications.</string>
<!-- Label for Video usage time -->
<string name="usage_type_video">Video</string>
<!-- Label for time that a feature has been on -->
<string name="usage_type_on_time">On time</string>
<string name="usage_type_on_time">Time on</string>
<!-- Label for time that there was no cell coverage -->
<string name="usage_type_no_coverage">Time without a signal</string>
<!-- Label for force stop action -->
<string name="battery_action_stop">Force stop</string>
<!-- Label for app details action -->
@@ -1758,7 +1762,7 @@ found in the list of installed applications.</string>
<!-- Suggestion for exploring application info to stop or uninstall -->
<string name="battery_sugg_apps_info">Stop or uninstall the application</string>
<!-- Suggestion for getting apps to consume less power due to GPS-->
<string name="battery_sugg_apps_gps">Turn off GPS when you're not using it</string>
<string name="battery_sugg_apps_gps">"Turn off GPS when you're not using it"</string>
<!-- Suggestion for getting apps to consume less power -->
<string name="battery_sugg_apps_settings">The application may offer settings to reduce battery use</string>