diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/crypt_keeper_status.xml | 38 | ||||
| -rw-r--r-- | res/layout/data_usage_app_title.xml | 3 | ||||
| -rw-r--r-- | res/layout/data_usage_detail.xml | 17 | ||||
| -rw-r--r-- | res/layout/installed_app_details.xml | 7 | ||||
| -rwxr-xr-x | res/layout/regulatory_info.xml | 15 | ||||
| -rw-r--r-- | res/layout/setup_preference.xml | 4 |
6 files changed, 33 insertions, 51 deletions
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml index df80fe3..c7264be 100644 --- a/res/layout/crypt_keeper_status.xml +++ b/res/layout/crypt_keeper_status.xml @@ -25,44 +25,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" > - - <com.android.internal.widget.DigitalClock android:id="@+id/time" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginTop="8dip" - android:layout_gravity="center" - android:layout_marginBottom="8dip" - > - - <!-- Because we can't have multi-tone fonts, we render two TextViews, one on - top of the other. Hence the redundant layout... --> - <TextView android:id="@*android:id/timeDisplayBackground" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="none" - android:textSize="@dimen/crypt_clock_size" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/crypt_keeper_clock_background" - android:layout_marginBottom="6dip" - /> - - <TextView android:id="@*android:id/timeDisplayForeground" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="none" - android:textSize="@dimen/crypt_clock_size" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/crypt_keeper_clock_foreground" - android:layout_alignStart="@*android:id/timeDisplayBackground" - android:layout_alignTop="@*android:id/timeDisplayBackground" - android:layout_marginBottom="6dip" - /> - - </com.android.internal.widget.DigitalClock> - <TextView android:id="@+id/status" android:layout_width="wrap_content" diff --git a/res/layout/data_usage_app_title.xml b/res/layout/data_usage_app_title.xml index baaa685..272d8f2 100644 --- a/res/layout/data_usage_app_title.xml +++ b/res/layout/data_usage_app_title.xml @@ -19,4 +19,5 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="marquee" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:textAppearance="?android:attr/textAppearanceMedium" + android:textAlignment="viewStart" /> diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml index eaac49c..6826764 100644 --- a/res/layout/data_usage_detail.xml +++ b/res/layout/data_usage_detail.xml @@ -48,29 +48,36 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dip" - android:orientation="vertical" /> + android:orientation="vertical" + android:textAlignment="viewStart" /> <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dip" android:textColor="#d88d3a" - android:text="@string/data_usage_label_foreground" /> + android:text="@string/data_usage_label_foreground" + android:textAlignment="viewStart" /> + <TextView android:id="@+id/app_foreground" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="#d88d3a" /> + android:textColor="#d88d3a" + android:textAlignment="viewStart" /> <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dip" - android:text="@string/data_usage_label_background" /> + android:text="@string/data_usage_label_background" + android:textAlignment="viewStart" /> + <TextView android:id="@+id/app_background" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:textAlignment="viewStart" /> </LinearLayout> diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml index 3b8bf5f..7829596 100644 --- a/res/layout/installed_app_details.xml +++ b/res/layout/installed_app_details.xml @@ -49,6 +49,11 @@ layout="@layout/two_buttons_panel" android:id="@+id/control_buttons_panel"/> + <!-- Force stop and uninstall buttons --> + <include + layout="@layout/two_buttons_panel" + android:id="@+id/more_control_buttons_panel"/> + <!-- Ban notifications for this package --> <CheckBox android:id="@+id/notification_switch" android:layout_width="wrap_content" @@ -408,6 +413,8 @@ android:layout_height="match_parent" android:orientation="vertical"> <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:text="@string/security_settings_premium_sms_desc" /> <Spinner android:id="@+id/security_settings_premium_sms_list" diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml index dc1efe8..5827557 100755 --- a/res/layout/regulatory_info.xml +++ b/res/layout/regulatory_info.xml @@ -13,9 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. --> -<ImageView xmlns:android="http://schemas.android.com/apk/res/android" - android:adjustViewBounds="true" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:scaleType="centerCrop" - android:src="@drawable/regulatory_info"/> + android:layout_height="wrap_content"> + <ImageView + android:adjustViewBounds="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scaleType="centerCrop" + android:src="@drawable/regulatory_info" /> +</ScrollView> + diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml index c2f6989..384ee86 100644 --- a/res/layout/setup_preference.xml +++ b/res/layout/setup_preference.xml @@ -54,7 +54,7 @@ android:layout_marginBottom="8dip" android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark" android:background="?android:attr/actionBarItemBackground" - android:contentDescription="@string/wifi_menu_wps_pbc" /> + android:contentDescription="@string/wifi_menu_more_options" /> </LinearLayout> @@ -180,4 +180,4 @@ </LinearLayout> </RelativeLayout> </LinearLayout> -</view>
\ No newline at end of file +</view> |