Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf6c5cf1 authored by Itzhak Katzenelson's avatar Itzhak Katzenelson
Browse files

Setting style and label fixes

Bug: 7205942, 7206851, 7206262
Change-Id: I5226f078ef58e04b2a8312c736ffcae064eda8ad
parent 064a24b1
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@
            android:entries="@array/clock_style_entries"
            android:entryValues="@array/clock_style_values"
            android:defaultValue="analog"
            android:dialogTitle="@string/clock_style_title" />
            android:dialogTitle="@string/clock_style" />
        <CheckBoxPreference
            android:key="automatic_home_clock"
            android:title="@string/automatic_home_clock"
@@ -63,7 +63,7 @@
        <ListPreference
            android:key="volume_button_setting"
            android:title="@string/volume_button_setting_title"
            android:dialogTitle="@string/volume_button_dialog_title"
            android:dialogTitle="@string/volume_button_setting_title"
            android:entries="@array/volume_button_setting_entries"
            android:entryValues="@array/volume_button_setting_values"
            android:defaultValue="1" />
+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

package com.android.deskclock;

import android.app.ActionBar;
import android.content.Intent;
import android.media.AudioManager;
import android.os.Bundle;
@@ -66,6 +67,10 @@ public class SettingsActivity extends PreferenceActivity
            ringtone.setAlert(alert);
        }
        ringtone.setChangeDefault();*/
        ActionBar actionBar = getActionBar();
        if (actionBar != null) {
            actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
        }
    }

    @Override
@@ -80,6 +85,9 @@ public class SettingsActivity extends PreferenceActivity
            case R.id.menu_item_help:
                startActivity(new Intent(this, HelpActivity.class));
                return true;
            case android.R.id.home:
                finish();
                return true;
            default:
                break;
        }