ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove/fix STOPSHIP comments" into honeycomb

Browse Source
This commit is contained in:
Todd Kennedy 2011-01-11 10:24:43 -08:00 committed by Android (Google) Code Review
commit 43600c915f
5 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
res/drawable/drag_background.xml
View File

@ -1,22 +0,0 @@
<?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.
-->
<!-- STOPSHIP Temporary UI -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true"
android:drawable="@drawable/drag_background_holo" />
<item android:drawable="@drawable/drag_background_holo" />
</selector>

3
res/menu/message_compose_option.xml
View File

@ -15,7 +15,6 @@
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<!-- STOPSHIP Need icon-->
<item
android:id="@+id/send"
android:title="@string/send_action"
@ -23,13 +22,13 @@
android:icon="@drawable/ic_menu_send_holo_light"
android:alphabeticShortcut="s"
/>
<!-- "Save draft" should only be text -->
<item
android:id="@+id/save"
android:title="@string/save_draft_action"
android:showAsAction="always"
android:alphabeticShortcut="d"
/>
<!-- STOPSHIP Need icon, don't need title-->
<item
android:id="@+id/discard"
android:title="@string/discard_action"

1
res/menu/message_list_fragment_option.xml
View File

@ -15,7 +15,6 @@
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<!-- STOPSHIP Need icon -->
<item
android:id="@+id/send"
android:orderInCategory="50"

1
res/menu/message_view_fragment_option.xml
View File

@ -15,7 +15,6 @@
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<!-- STOPSHIP Need icons, Don't need text -->
<item
android:id="@+id/move"
android:orderInCategory="1000"

16
src/com/android/email/activity/MailboxListItem.java
View File

@ -24,7 +24,6 @@ import android.content.Context;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.widget.RelativeLayout;
public class MailboxListItem extends RelativeLayout {
@ -82,19 +81,4 @@ public class MailboxListItem extends RelativeLayout {
return false;
}
}
@Override
public boolean onTouchEvent(MotionEvent event) {
// TODO Can we know we're in mailbox list / message list two-pane mode? If so, we should
// check for this instead...
// We don't want a touch very near the right edge to be used to visit a folder, as it might
// easily have been an attempt to drag
// STOPSHIP
if (Welcome.useTwoPane(getContext()) && event.getAction() == MotionEvent.ACTION_DOWN) {
if (event.getX() + 10 > this.getWidth()) {
return true;
}
}
return super.onTouchEvent(event);
}
}