Commit 2051f127 authored by Erik's avatar Erik
Browse files

Adds an action bar to the allInOne Calendar view.

The Action Bar doesn't have any functionality yet, but it provides the
setup for creating the bar and adding elements to it.

Change-Id: Ie4b6214d88dcb73869e04aeb098737efdacf2a59
parent e5a8f94f
......@@ -62,7 +62,7 @@
<activity
android:name="AllInOneActivity"
android:label="@string/app_aio_label"
android:theme="@style/CalendarTheme">
android:theme="@style/CalendarTheme.WithActionBar">
<intent-filter>
<action
android:name="android.intent.action.MAIN" />
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/day"
android:alphabeticShortcut="d"
android:title="@string/day_view"
android:icon="@android:drawable/ic_menu_day"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/week"
android:alphabeticShortcut="w"
android:title="@string/week_view"
android:icon="@android:drawable/ic_menu_week"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/month"
android:alphabeticShortcut="m"
android:title="@string/month_view"
android:icon="@android:drawable/ic_menu_month"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/today"
android:alphabeticShortcut="t"
android:title="@string/goto_today"
android:icon="@android:drawable/ic_menu_today"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/add"
android:alphabeticShortcut="r"
android:title="@string/event_create"
android:icon="@android:drawable/ic_menu_add"
android:showAsAction="always"
/>
<item android:id="@+id/account_settings"
android:title="@string/menu_preferences"
android:icon="@android:drawable/ic_menu_preferences"
android:showAsAction="always"
/>
</menu>
......@@ -97,6 +97,11 @@
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="CalendarTheme.WithActionBar">
<item name="android:windowNoTitle">false</item>
<item name="android:windowActionBar">true</item>
</style>
<style name="MultiStateButton">
<item name="android:focusable">true</item>
<item name="android:clickable">true</item>
......
......@@ -16,8 +16,10 @@
package com.android.calendar;
import android.app.ActionBar;
import android.app.Activity;
import android.os.Bundle;
import android.view.Menu;
public class AllInOneActivity extends Activity {
@Override
......@@ -25,4 +27,14 @@ public class AllInOneActivity extends Activity {
super.onCreate(savedInstanceState);
setContentView(R.layout.all_in_one);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
ActionBar actionBar = getActionBar();
actionBar.setStandardNavigationMode(getText(R.string.app_label));
getMenuInflater().inflate(R.menu.all_in_one_title_bar, menu);
return true;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment