summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-02-21 20:07:27 -0800
committerDianne Hackborn <hackbod@google.com>2010-02-22 11:31:37 -0800
commitcb497546ba55ef98fb561dd9a07c7a485a918f4b (patch)
tree0acb67261d4bfe2a51d95451fb1f8c2464fdbf8f /res/layout
parentd814bb7309f052a0b242047ab9a9cdcbaffc6671 (diff)
downloadpackages_apps_Settings-cb497546ba55ef98fb561dd9a07c7a485a918f4b.zip
packages_apps_Settings-cb497546ba55ef98fb561dd9a07c7a485a918f4b.tar.gz
packages_apps_Settings-cb497546ba55ef98fb561dd9a07c7a485a918f4b.tar.bz2
Add new button to report battery usage to the developer.
This displays a new button on the application battery usage details screen for the user to send a bug report to the developer, if that is possible to do. Also adds a button to directly force stop the app from the details screen, and uses the new facilities to determine whether the button should be enabled.
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/power_usage_action_item.xml1
-rw-r--r--res/layout/power_usage_details.xml11
-rw-r--r--res/layout/running_services.xml10
3 files changed, 17 insertions, 5 deletions
diff --git a/res/layout/power_usage_action_item.xml b/res/layout/power_usage_action_item.xml
index a53c551..e4d8b5a 100644
--- a/res/layout/power_usage_action_item.xml
+++ b/res/layout/power_usage_action_item.xml
@@ -28,6 +28,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
+ android:paddingBottom="4dip"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"/>
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index 18781a9..23be53f 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -87,6 +87,17 @@
</RelativeLayout>
</LinearLayout>
+ <!-- Force stop and report buttons -->
+ <LinearLayout
+ android:id="@+id/two_buttons_panel"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="6dip"
+ android:orientation="vertical">
+ <include
+ layout="@layout/two_buttons_panel"/>
+ </LinearLayout>
+
<TextView
style="?android:attr/listSeparatorTextViewStyle"
android:text="@string/details_subtitle" />
diff --git a/res/layout/running_services.xml b/res/layout/running_services.xml
index 2f464a5..5c0da6f 100644
--- a/res/layout/running_services.xml
+++ b/res/layout/running_services.xml
@@ -35,20 +35,20 @@
android:text="@string/no_running_services"
android:textAppearance="?android:attr/textAppearanceLarge" />
</FrameLayout>
- <LinearLayout
+ <view class="com.android.settings.RunningServices$LinearColorBar"
+ android:id="@+id/color_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:background="?android:attr/colorForeground"
android:padding="4dp">
- <TextView android:id="@+id/backgroundText"
+ <TextView android:id="@+id/foregroundText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceSmallInverse"
android:color="?android:attr/textColorPrimaryInverse"
android:singleLine="true" />
- <TextView android:id="@+id/foregroundText"
+ <TextView android:id="@+id/backgroundText"
android:layout_gravity="center_vertical|right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -56,5 +56,5 @@
android:textAppearance="?android:attr/textAppearanceSmallInverse"
android:color="?android:attr/textColorPrimaryInverse"
android:singleLine="true" />
- </LinearLayout>
+ </view>
</LinearLayout>