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

Commit 21e815bd authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Revert "Fix back and home behavior" 

This reverts commit 828df502
parent 828df502

AndroidManifest.xml

+5 −6
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ 
                <data android:host="com.android.calendar" />

                <data android:scheme="content"/>

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.item/event" />

            </intent-filter>

        </activity>



        <activity-alias android:name="LaunchActivity"
@@ -75,17 +80,11 @@ 
        </activity-alias>



        <activity android:name="EventInfoActivity"

            android:parentActivityName="com.android.calendar.AllInOneActivity"

            android:theme="@style/CalendarTheme.WithActionBar">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.item/event" />

            </intent-filter>

        </activity>



        <activity android:name=".event.EditEventActivity"

src/com/android/calendar/EventInfoActivity.java

+4 −8
Original line number Diff line number Diff line
@@ -24,12 +24,9 @@ import android.app.ActionBar; 
import android.app.Activity;

import android.app.FragmentManager;

import android.app.FragmentTransaction;

import android.content.ContentUris;

import android.content.Intent;

import android.content.res.Resources;

import android.net.Uri;

import android.os.Bundle;

import android.provider.CalendarContract.Events;

import android.util.Log;



public class EventInfoActivity extends Activity {
@@ -71,11 +68,10 @@ public class EventInfoActivity extends Activity { 
            }

        }



        // If we do not support showing full screen event info in this configuration,

        // close the activity and show the event in AllInOne.

        Resources res = getResources();

        if (!res.getBoolean(R.bool.agenda_show_event_info_full_screen)

                && !res.getBoolean(R.bool.show_event_info_full_screen)) {

        // Never show this activity if we support showing double pane agenda view

        // If we do support this, instead launch AllInOneActivity in double pane mode

        // This can happen if this activity is launched while in portrait mode in sw600dp

        if (!getResources().getBoolean(R.bool.agenda_show_event_info_full_screen)) {

            CalendarController.getInstance(this)

                    .launchViewEvent(mEventId, mStartMillis, mEndMillis);

            finish();

src/com/android/calendar/GoogleCalendarUriIntentFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ public class GoogleCalendarUriIntentFilter extends Activity { 
                            Uri calendarUri = ContentUris.withAppendedId(Events.CONTENT_URI,

                                    eventId);

                            intent = new Intent(Intent.ACTION_VIEW, calendarUri);

                            intent.setClass(this, EventInfoActivity.class);

                            intent.setClass(this, AllInOneActivity.class);

                            intent.putExtra(EXTRA_EVENT_BEGIN_TIME, startMillis);

                            intent.putExtra(EXTRA_EVENT_END_TIME, endMillis);

                            if (attendeeStatus != ATTENDEE_STATUS_NONE) {

src/com/android/calendar/alerts/AlertActivity.java

+8 −10
Original line number Diff line number Diff line
@@ -18,19 +18,22 @@ package com.android.calendar.alerts; 


import com.android.calendar.AllInOneActivity;

import com.android.calendar.AsyncQueryService;

import com.android.calendar.EventInfoActivity;

import com.android.calendar.R;

import com.android.calendar.Utils;



import android.app.Activity;

import android.app.AlarmManager;

import android.app.NotificationManager;

import android.app.TaskStackBuilder;

import android.app.PendingIntent;

import android.content.ContentUris;

import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;

import android.database.Cursor;

import android.net.Uri;

import android.net.Uri.Builder;

import android.os.Bundle;

import android.provider.CalendarContract;

import android.provider.CalendarContract.CalendarAlerts;

import android.util.Log;

import android.view.View;
@@ -147,7 +150,7 @@ public class AlertActivity extends Activity implements OnClickListener { 






    private final OnItemClickListener mViewListener = new OnItemClickListener() {

    private OnItemClickListener mViewListener = new OnItemClickListener() {



        @Override

        public void onItemClick(AdapterView<?> parent, View view, int position,
@@ -158,17 +161,12 @@ public class AlertActivity extends Activity implements OnClickListener { 
            // Mark this alarm as DISMISSED

            dismissAlarm(cursor.getLong(INDEX_ROW_ID));



            // build an intent and task stack to start EventInfoActivity with AllInOneActivity

            // as the parent activity rooted to home.

            long id = cursor.getInt(AlertActivity.INDEX_EVENT_ID);

            long startMillis = cursor.getLong(AlertActivity.INDEX_BEGIN);

            long endMillis = cursor.getLong(AlertActivity.INDEX_END);

            Intent eventIntent = AlertUtils.buildEventViewIntent(AlertActivity.this, id,

                    startMillis, endMillis);



            TaskStackBuilder.from(AlertActivity.this)

                    .addParentStack(EventInfoActivity.class).addNextIntent(eventIntent)

                    .startActivities();

            alertActivity.startActivity(eventIntent);



            alertActivity.finish();

        }

src/com/android/calendar/alerts/AlertUtils.java

+4 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.net.Uri; 
import android.provider.CalendarContract;

import android.provider.CalendarContract.CalendarAlerts;



import com.android.calendar.EventInfoActivity;

import com.android.calendar.AllInOneActivity;



public class AlertUtils {
@@ -87,9 +87,10 @@ public class AlertUtils { 
    public static Intent buildEventViewIntent(Context c, long eventId, long begin, long end){

        Intent i = new Intent(Intent.ACTION_VIEW);

        Uri.Builder builder = CalendarContract.CONTENT_URI.buildUpon();

        i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        builder.appendEncodedPath("events/" + eventId);

        i.setData(builder.build());

        i.setClass(c, EventInfoActivity.class);

        i.setClass(c, AllInOneActivity.class);

        i.putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, begin);

        i.putExtra(CalendarContract.EXTRA_EVENT_END_TIME, end);

        return i;