diff options
| -rwxr-xr-x | AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | res/layout/preferences_category.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 3 | ||||
| -rw-r--r-- | src/com/android/camera/SettingsActivity.java | 9 |
5 files changed, 18 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 06ad579ae..1b8a88d2d 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -76,13 +76,14 @@ </activity> <activity - android:theme="@style/Theme.OneUISettings" + android:theme="@style/Theme.Settings" android:name="com.android.camera.SettingsActivity" android:clearTaskOnLaunch="true" android:configChanges="orientation|screenSize|keyboardHidden" android:icon="@mipmap/ic_launcher_camera" android:label="@string/snapcam_app_name" - android:launchMode="singleTop" > + android:launchMode="singleTop" + android:parentActivityName="com.android.camera.CameraActivity"> </activity> <activity diff --git a/res/layout/preferences_category.xml b/res/layout/preferences_category.xml index 3dae03b0a..e002c4e40 100644 --- a/res/layout/preferences_category.xml +++ b/res/layout/preferences_category.xml @@ -33,7 +33,7 @@ android:gravity="center_vertical" android:paddingLeft="15dp" android:paddingTop="15dp" - android:textAllCaps="true" + android:textAllCaps="false" android:textColor="#ff999999" android:textSize="14sp" android:textStyle="bold" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 94c901f65..0b2310439 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -772,4 +772,6 @@ CHAR LIMIT = NONE] --> <string name="delete_all_best_dialog_positive_bt">Delete All</string> <string name="overflow_best_item1">Save All</string> <string name="overflow_best_item2">Delete All</string> + + <string name="settings_title">Settings</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index a48d453cc..a65538cb3 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -22,6 +22,9 @@ <style name="Theme.OneUISettings" parent="@android:style/Theme.Material.Light.NoActionBar.Fullscreen"> <item name="android:colorAccent">#5999e1</item> </style> + <style name="Theme.Settings" parent="@android:style/Theme.Material.Light"> + <item name="android:colorAccent">#5999e1</item> + </style> <style name="Theme.Camera" parent="Theme.CameraBase"> <item name="android:windowFullscreen">true</item> diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 00f42daa4..a54be02af 100644 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -29,6 +29,7 @@ package com.android.camera; +import android.app.ActionBar; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.SharedPreferences; @@ -108,6 +109,14 @@ public class SettingsActivity extends PreferenceActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + int flag = WindowManager.LayoutParams.FLAG_FULLSCREEN; + Window window = getWindow(); + window.setFlags(flag, flag); + ActionBar actionBar = getActionBar(); + if (actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setTitle(getResources().getString(R.string.settings_title)); + } final boolean isSecureCamera = getIntent().getBooleanExtra( CameraUtil.KEY_IS_SECURE_CAMERA, false); if (isSecureCamera) { |