summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Brabham <optedoblivion@cyngn.com>2015-04-24 13:56:00 -0700
committerArne Coucheron <arco68@gmail.com>2015-05-15 04:19:22 +0000
commit5a81dd55f48e4dba465eaaa2f0e3056c2f2b84fa (patch)
treebca300d6f369d9c95dac813378dc738559a54d5a
parent09eafb076779f3717c1d9c0ed9466b06e6f2ed15 (diff)
downloadandroid_packages_apps_DeskClock-stable/cm-12.0-YNG3C.tar.gz
android_packages_apps_DeskClock-stable/cm-12.0-YNG3C.tar.bz2
android_packages_apps_DeskClock-stable/cm-12.0-YNG3C.zip
Make new menu entry to link to cLock widget settings.stable/cm-12.0-YNG3C
Change-Id: I13ca3156c34eccdd8f60d8585281ae0585aac58e
-rw-r--r--res/menu/desk_clock_menu.xml3
-rw-r--r--res/values/cm_strings.xml3
-rw-r--r--src/com/android/deskclock/DeskClock.java17
3 files changed, 23 insertions, 0 deletions
diff --git a/res/menu/desk_clock_menu.xml b/res/menu/desk_clock_menu.xml
index b2420506f..f4c9c6789 100644
--- a/res/menu/desk_clock_menu.xml
+++ b/res/menu/desk_clock_menu.xml
@@ -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"/>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index bbbda35f8..df35d7a3c 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -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>
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index dc3cb45a7..0deced245 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -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) {