OmniGears: remove wakelock view since unplug
the data is no correct and just confusing
only support the reset based wakelock data
rework layout of time in state and wakelock view
Change-Id: If7fda204942b69cf0176dbdd26cd5bc321901a12
diff --git a/res/layout/wakelocks.xml b/res/layout/wakelocks.xml
index 53799af..38f3bde 100644
--- a/res/layout/wakelocks.xml
+++ b/res/layout/wakelocks.xml
@@ -26,8 +26,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingStart="10dp" >
+ android:orientation="horizontal" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -40,105 +39,67 @@
android:gravity="center_vertical" />
</LinearLayout>
<LinearLayout
+ android:id="@+id/state_time_select_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingStart="10dp" >
- <LinearLayout
- android:layout_width="0dp"
+ android:visibility="gone">
+ <TextView
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- android:layout_weight="0.5" >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/spinner_period_title"/>
- <Spinner
- android:id="@+id/period_type_select"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical" />
- </LinearLayout>
- <LinearLayout
- android:id="@+id/state_time_select_group"
- android:layout_width="0dp"
+ android:layout_gravity="center_vertical"
+ android:text="@string/spinner_state_time_title"/>
+ <Spinner
+ android:id="@+id/state_time_select"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:gravity="center_vertical|end"
- android:visibility="gone"
- android:paddingStart="10dp"
- android:layout_weight="0.5">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/spinner_state_time_title"/>
- <Spinner
- android:id="@+id/state_time_select"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical" />
- </LinearLayout>
+ android:gravity="center_vertical" />
</LinearLayout>
<LinearLayout
android:id="@+id/ui_state_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingStart="10dp"
- android:paddingEnd="10dp"
android:paddingBottom="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/ui_total_state_time"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1" />
+ android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/ui_total_wakelock_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end" />
</LinearLayout>
- <View
- android:layout_width="match_parent"
- android:layout_height="2dp"
- android:paddingStart="10dp"
- android:paddingEnd="10dp"
- android:background="#28ffffff" />
+
<ScrollView
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="0dp"
android:orientation="vertical"
- android:paddingStart="10dp"
- android:paddingEnd="10dp"
android:paddingTop="10dp"
- android:scrollbarStyle="insideInset" >
- <LinearLayout
+ android:scrollbarStyle="insideInset"
+ android:layout_weight="1" >
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
+ android:layout_height="match_parent"
+ android:paddingBottom="10dp" >
<LinearLayout
android:id="@+id/ui_states_view"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingBottom="10dp" />
+ android:layout_height="match_parent"
+ android:orientation="vertical" />
<TextView
android:id="@+id/ui_kernel_wakelock_warning"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="15dp"
+ android:layout_height="80dp"
+ android:gravity="center"
android:text="@string/no_kernel_wakelock_file_found"
- android:textSize="20sp"
- android:visibility="gone" />
+ android:visibility="gone"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:id="@+id/ui_progress"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="80dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone" >
@@ -146,6 +107,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
- </LinearLayout>
+ </FrameLayout>
</ScrollView>
</LinearLayout>