diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/capture_module.xml | 2 | ||||
| -rw-r--r-- | res/xml/capture_preferences.xml | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index dd7d3cb1b..41757c535 100644 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center"> - + <include layout="@layout/selfie_flash_view" /> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 9ffe7d537..a55cae460 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -295,4 +295,12 @@ camera:key="pref_camera2_hfr_key" camera:singleIcon="@drawable/ic_settings_fps" camera:title="@string/pref_camera_hfr_title" /> + + <IconListPreference + camera:defaultValue="@string/pref_selfie_flash_default" + camera:entries="@array/pref_selfie_flash_entries" + camera:entryValues="@array/pref_selfie_flash_entryvalues" + camera:key="pref_selfie_flash_key" + camera:singleIcon="@drawable/ic_settings_flash" + camera:title="@string/pref_selfie_flash_title" /> </PreferenceGroup> |