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

Commit 278ea920 authored by Michael Chan's avatar Michael Chan
Browse files

Now you can get to settings in AlarmClock on a tablet

Bug: 6492391
Change-Id: Ifdf5f461f884fc3bcd5f1f570abf19248f58bf52
parent 1779cd08
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@
    <ListView
        android:id="@+id/alarms_list"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_height="0dp"
        android:layout_weight="1"
        android:layout_marginLeft="16dip"
        android:layout_marginRight="16dip" />
@@ -76,11 +76,20 @@
        android:orientation="horizontal"
        style="?android:attr/buttonBarStyle">

        <Button android:id="@+id/settings"
            style="?android:attr/buttonBarButtonStyle"
            android:focusable="true"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="1"
            android:text="@string/settings"/>

        <Button android:id="@+id/done"
            style="?android:attr/buttonBarButtonStyle"
            android:focusable="true"
            android:layout_width="match_parent"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="1"
            android:text="@string/done"/>
        </LinearLayout>

+10 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.CheckBox;
import android.widget.CursorAdapter;
import android.widget.ImageButton;
import android.widget.ListView;
import android.widget.TextView;

@@ -235,6 +234,16 @@ public class AlarmClock extends Activity implements OnItemClickListener {
            });
        }

        View settingsButton = findViewById(R.id.settings);
        if (settingsButton != null) {
            settingsButton.setOnClickListener(new View.OnClickListener() {
                public void onClick(View v) {
                    startActivity(new Intent(AlarmClock.this, SettingsActivity.class));
                    finish();
                }
            });
        }

        ActionBar actionBar = getActionBar();
        if (actionBar != null) {
            actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);