diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-11-17 15:53:32 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-11-26 11:48:15 +0800 |
| commit | 9b7bfbc8ac25f1df20b7ed0aa79bf1f36299e981 (patch) | |
| tree | 740aa1b58c30aaedb5cc42dccfe976d8cfb0f0b2 /res | |
| parent | 59ddc8c1add2fcffe523e3877baad1b6cc5ba2fb (diff) | |
| download | LegacyCamera-9b7bfbc8ac25f1df20b7ed0aa79bf1f36299e981.zip LegacyCamera-9b7bfbc8ac25f1df20b7ed0aa79bf1f36299e981.tar.gz LegacyCamera-9b7bfbc8ac25f1df20b7ed0aa79bf1f36299e981.tar.bz2 | |
Add title and its holo background for settings.
bug:3226752
Change-Id: I10d2430fb2db9283fa080284f9ad6c043d056865
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-xlarge/basic_setting_popup.xml | 20 | ||||
| -rw-r--r-- | res/layout-xlarge/other_setting_popup.xml | 44 |
2 files changed, 51 insertions, 13 deletions
diff --git a/res/layout-xlarge/basic_setting_popup.xml b/res/layout-xlarge/basic_setting_popup.xml index 1fb658d..d26fd06 100644 --- a/res/layout-xlarge/basic_setting_popup.xml +++ b/res/layout-xlarge/basic_setting_popup.xml @@ -23,5 +23,23 @@ android:layout_centerVertical="true" android:layout_alignParentRight="true" android:layout_marginRight="40dp" - android:orientation="vertical" /> + android:orientation="vertical"> + <FrameLayout android:id="@+id/topPanel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="48dip"> + <TextView android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|bottom" + android:layout_marginLeft="16dp" + android:layout_marginBottom="10dp" + android:textColor="@android:color/white" + style="@style/SettingPickerText" /> + </FrameLayout> + <LinearLayout android:id="@+id/contentPanel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" /> +</com.android.camera.ui.BasicSettingPopup> diff --git a/res/layout-xlarge/other_setting_popup.xml b/res/layout-xlarge/other_setting_popup.xml index 5fd345d..b9eb587 100644 --- a/res/layout-xlarge/other_setting_popup.xml +++ b/res/layout-xlarge/other_setting_popup.xml @@ -26,16 +26,36 @@ android:layout_marginRight="40dp" android:orientation="vertical"> - <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_recordlocation_key" - style="@style/SettingRow" /> - <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_focusmode_key" - style="@style/SettingRow" /> - <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_exposure_key" - style="@style/SettingRow" /> - <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_picturesize_key" - style="@style/SettingRow" /> - <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_jpegquality_key" - style="@style/SettingRow" /> - <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_scenemode_key" - style="@style/SettingRow" /> + <FrameLayout android:id="@+id/topPanel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="48dip"> + <TextView android:id="@+id/title" + android:text="@string/pref_camera_settings_category" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|bottom" + android:layout_marginLeft="16dp" + android:layout_marginBottom="10dp" + android:textColor="@android:color/white" + style="@style/SettingPickerText" /> + </FrameLayout> + + <LinearLayout android:id="@+id/contentPanel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_recordlocation_key" + style="@style/SettingRow" /> + <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_focusmode_key" + style="@style/SettingRow" /> + <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_exposure_key" + style="@style/SettingRow" /> + <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_picturesize_key" + style="@style/SettingRow" /> + <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_jpegquality_key" + style="@style/SettingRow" /> + <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_scenemode_key" + style="@style/SettingRow" /> + </LinearLayout> </com.android.camera.ui.OtherSettingsPopup> |