diff options
author | John Spurlock <jspurlock@google.com> | 2012-08-22 09:21:58 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2012-08-29 16:41:01 -0400 |
commit | 6df18e2713a15a52567ac1a833953ac4bfa38f15 (patch) | |
tree | aed4f01d174b23d2dee2fd912f82fbf74bb171de /res/layout | |
parent | c6015d2f593d0e5ef909d7157df4b15831236acb (diff) | |
download | packages_apps_Settings-6df18e2713a15a52567ac1a833953ac4bfa38f15.zip packages_apps_Settings-6df18e2713a15a52567ac1a833953ac4bfa38f15.tar.gz packages_apps_Settings-6df18e2713a15a52567ac1a833953ac4bfa38f15.tar.bz2 |
New dream settings - first cut
First draft implementation of mocks for dream settings.
Want to merge for the weekly build, so a few things remain, namely:
- flat style for preview/settings buttons + dividers
- animation between dream row expanded/collapsed state
- wire up the help url
- possibly ditch the non-standard style
- add logging
- refresh when packages are installed/uninstalled
Bug:7010260
Change-Id: I96e3ab944170925bd76edf7b8b1127adfffc6262
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/dream_info_row.xml | 82 | ||||
-rw-r--r-- | res/layout/dream_picker_row.xml | 39 |
2 files changed, 82 insertions, 39 deletions
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml new file mode 100644 index 0000000..64c2653 --- /dev/null +++ b/res/layout/dream_info_row.xml @@ -0,0 +1,82 @@ +<!-- + Copyright (C) 2012 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="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/dream_info_bg" + android:orientation="vertical" > + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <ImageView + android:id="@android:id/icon" + android:layout_width="@android:dimen/app_icon_size" + android:layout_height="@android:dimen/app_icon_size" + android:layout_centerVertical="true" + android:layout_margin="8dp" + android:contentDescription="@null" + android:scaleType="fitCenter" /> + + <RadioButton + android:id="@android:id/button1" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_margin="8dp" + android:duplicateParentState="true" /> + + <TextView + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@android:id/button1" + android:layout_toRightOf="@android:id/icon" + android:ellipsize="end" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceLarge" /> + </RelativeLayout> + + <RelativeLayout + android:id="@android:id/widget_frame" + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <Button + android:id="@android:id/button2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/screensaver_settings_dream_settings" /> + + <Button + android:id="@android:id/button3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/screensaver_settings_dream_preview" /> + </LinearLayout> + </RelativeLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml deleted file mode 100644 index b445cf4..0000000 --- a/res/layout/dream_picker_row.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2011, 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="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:paddingStart="2dip" - android:gravity="center_vertical"> - - <ImageView android:id="@+id/icon" - android:layout_width="@android:dimen/app_icon_size" - android:layout_height="@android:dimen/app_icon_size" - android:scaleType="fitCenter" - android:contentDescription="@null" /> - - <TextView android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:paddingStart="6dip" /> - -</LinearLayout> - |