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

Commit 5a81dd55 authored by Martin Brabham's avatar Martin Brabham Committed by Arne Coucheron
Browse files

Make new menu entry to link to cLock widget settings. 

Change-Id: I13ca3156c34eccdd8f60d8585281ae0585aac58e
parent 09eafb07

res/menu/desk_clock_menu.xml

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
        <item android:id="@+id/menu_item_settings"

            android:title="@string/menu_item_settings"

            android:icon="@android:drawable/ic_menu_preferences"/>

        <item android:id="@+id/menu_item_widget_settings"

            android:title="@string/menu_item_widget_settings"

            android:icon="@android:drawable/ic_menu_preferences"/>

        <item android:id="@+id/menu_item_help"

            android:title="@string/menu_item_help"

            android:icon="@android:drawable/ic_menu_preferences"/>

res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -95,4 +95,7 @@ 


    <string name="default_auto_silence_value" translatable="false">10</string>



    <string name="menu_item_widget_settings">Widget settings</string>

    <string name="activity_not_found">Activity not found!</string>



</resources>

src/com/android/deskclock/DeskClock.java

+17 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.app.Fragment; 
import android.app.FragmentManager;

import android.app.FragmentTransaction;

import android.content.ActivityNotFoundException;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;
@@ -48,6 +49,7 @@ import android.view.ViewOutlineProvider; 
import android.widget.ImageButton;

import android.widget.TextView;



import android.widget.Toast;

import com.android.deskclock.alarms.AlarmStateManager;

import com.android.deskclock.provider.Alarm;

import com.android.deskclock.stopwatch.StopwatchFragment;
@@ -78,6 +80,10 @@ public class DeskClock extends Activity implements LabelDialogFragment.TimerLabe 
    // The depth of fab, use it to create shadow

    private static final float FAB_DEPTH = 20f;

    private static final int UNKNOWN_COLOR_ID = 0;

    private static final String LC_PACKAGE = "com.cyanogenmod.lockclock";

    private static final String LC_ACTIVITY = LC_PACKAGE + ".preference.Preferences";

    private static final ComponentName sWidgetSettingComponentName = new ComponentName

            (LC_PACKAGE, LC_ACTIVITY);



    private boolean mIsFirstLaunch = true;

    private ActionBar mActionBar;
@@ -363,6 +369,17 @@ public class DeskClock extends Activity implements LabelDialogFragment.TimerLabe 
            case R.id.menu_item_settings:

                startActivity(new Intent(DeskClock.this, SettingsActivity.class));

                return true;

            case R.id.menu_item_widget_settings:

                Intent wsi = new Intent();

                wsi.setComponent(sWidgetSettingComponentName);

                try {

                    startActivity(wsi);

                } catch (ActivityNotFoundException e) {

                    Toast.makeText(this, getResources().getString(R.string.activity_not_found),

                            Toast.LENGTH_SHORT).show();

                    Log.w(LOG_TAG, "Cannot find the activity!");

                }

                return true;

            case R.id.menu_item_help:

                Intent i = item.getIntent();

                if (i != null) {