diff options
| author | Vikram Aggarwal <viki@google.com> | 2011-12-19 08:14:16 -0800 |
|---|---|---|
| committer | Vikram Aggarwal <viki@google.com> | 2012-01-03 15:12:15 -0800 |
| commit | 5e5ac748eadbb17eee84b39a424b8b9270ade46c (patch) | |
| tree | e3b623254fbbe038fc00e1bb8b593fc10328faa3 /res | |
| parent | 44b3288d6edb01259b44e831f9dc2b3e0f762785 (diff) | |
| download | android_packages_apps_UnifiedEmail-5e5ac748eadbb17eee84b39a424b8b9270ade46c.tar.gz android_packages_apps_UnifiedEmail-5e5ac748eadbb17eee84b39a424b8b9270ade46c.tar.bz2 android_packages_apps_UnifiedEmail-5e5ac748eadbb17eee84b39a424b8b9270ade46c.zip | |
Adding the ActionBar to the unified codebase.
Change-Id: I4067b55aa2d7a020b682567dcd2355a4e7d91450
Diffstat (limited to 'res')
61 files changed, 1390 insertions, 433 deletions
diff --git a/res/drawable-sw600dp/conversation_read_selector.xml b/res/drawable-sw600dp/conversation_read_selector.xml index 6a33b811b..1e9751a14 100644 --- a/res/drawable-sw600dp/conversation_read_selector.xml +++ b/res/drawable-sw600dp/conversation_read_selector.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_focused="true" diff --git a/res/drawable-sw600dp/conversation_unread_selector.xml b/res/drawable-sw600dp/conversation_unread_selector.xml index 0dbf5050e..47848083f 100644 --- a/res/drawable-sw600dp/conversation_unread_selector.xml +++ b/res/drawable-sw600dp/conversation_unread_selector.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_focused="true" diff --git a/res/drawable/archive.xml b/res/drawable/archive.xml new file mode 100644 index 000000000..a99fe3375 --- /dev/null +++ b/res/drawable/archive.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="true" + android:drawable="@drawable/ic_menu_archive_holo_light" /> + <item android:state_enabled="false" + android:drawable="@drawable/ic_menu_archive_disabled_holo_light" /> +</selector> diff --git a/res/drawable/conversation_read_selector.xml b/res/drawable/conversation_read_selector.xml index 705ea0981..37f8feefb 100644 --- a/res/drawable/conversation_read_selector.xml +++ b/res/drawable/conversation_read_selector.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" diff --git a/res/drawable/conversation_unread_selector.xml b/res/drawable/conversation_unread_selector.xml index 32f299483..b087ea985 100644 --- a/res/drawable/conversation_unread_selector.xml +++ b/res/drawable/conversation_unread_selector.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" diff --git a/res/drawable/conversation_wide_read_selector.xml b/res/drawable/conversation_wide_read_selector.xml index d9ed25564..16cf9b754 100644 --- a/res/drawable/conversation_wide_read_selector.xml +++ b/res/drawable/conversation_wide_read_selector.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_focused="true" diff --git a/res/drawable/conversation_wide_unread_selector.xml b/res/drawable/conversation_wide_unread_selector.xml index 832246581..bcfe7b533 100644 --- a/res/drawable/conversation_wide_unread_selector.xml +++ b/res/drawable/conversation_wide_unread_selector.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_focused="true" diff --git a/res/drawable/send.xml b/res/drawable/send.xml index 3b62db574..14bc4f44e 100644 --- a/res/drawable/send.xml +++ b/res/drawable/send.xml @@ -1,8 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (c) 2010 Google Inc. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/res/drawable/trash.xml b/res/drawable/trash.xml index c87fc94c4..442e55f69 100644 --- a/res/drawable/trash.xml +++ b/res/drawable/trash.xml @@ -1,8 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (c) 2011 Google Inc. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/res/layout-sw600dp/compose.xml b/res/layout-sw600dp/compose.xml index 96023662a..13589c092 100644 --- a/res/layout-sw600dp/compose.xml +++ b/res/layout-sw600dp/compose.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -94,4 +96,4 @@ </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/res/layout-sw600dp/compose_buttons.xml b/res/layout-sw600dp/compose_buttons.xml index ff936bb2d..85ff3b56f 100644 --- a/res/layout-sw600dp/compose_buttons.xml +++ b/res/layout-sw600dp/compose_buttons.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -46,4 +48,4 @@ android:gravity="left" android:layout_marginLeft="14dip" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout-sw600dp/readme.xml b/res/layout-sw600dp/readme.xml index 47b967c9e..fda4580d1 100644 --- a/res/layout-sw600dp/readme.xml +++ b/res/layout-sw600dp/readme.xml @@ -1,7 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> +<!-- UnifiedEmail directory creation --> <View xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" - android:layout_height="wrap_content"/>
\ No newline at end of file + android:layout_height="wrap_content"/> diff --git a/res/layout/account_switch_spinner_dropdown_header.xml b/res/layout/account_switch_spinner_dropdown_header.xml new file mode 100644 index 000000000..af1a53955 --- /dev/null +++ b/res/layout/account_switch_spinner_dropdown_header.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="32dip" + android:layout_gravity="center_vertical" + style="?android:attr/listSeparatorTextViewStyle" + android:paddingLeft="@dimen/label_list_heading_padding_side" + android:paddingRight="@dimen/label_list_heading_padding_side"> + + <TextView + android:textAllCaps="true" + android:textSize="14sp" + android:textColor="@color/label_list_heading_text_color" + android:textStyle="bold" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/recent_labels"/> + + <TextView + android:id="@+id/account_spinner_account_name" + android:ellipsize="end" + android:singleLine="true" + android:textSize="14sp" + android:textColor="@color/label_list_heading_text_color" + android:layout_height="wrap_content" + android:layout_width="0dip" + android:layout_weight="1" + android:gravity="center_vertical|right" /> + +</LinearLayout> diff --git a/res/layout/account_switch_spinner_dropdown_item.xml b/res/layout/account_switch_spinner_dropdown_item.xml new file mode 100644 index 000000000..94bcfcc8f --- /dev/null +++ b/res/layout/account_switch_spinner_dropdown_item.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + style="?android:attr/spinnerDropDownItemStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/account_dropdown_item_height" + android:gravity="center_vertical"> + + <RelativeLayout + android:layout_height="wrap_content" + android:layout_width="0dip" + android:layout_weight="1"> + <TextView + android:id="@+id/account_spinner_label" + android:singleLine="true" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:ellipsize="end" + style="@style/AccountSpinnerDropdownTextPrimary" + android:visibility="gone" /> + + <TextView + android:id="@+id/account_spinner_accountname" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:ellipsize="end" + android:layout_below="@id/account_spinner_label" + style="@style/AccountSpinnerDropdownTextSecondary" /> + + </RelativeLayout> + + <TextView + android:id="@+id/account_spinner_unread_count" + style="@style/UnreadCount" /> + +</LinearLayout> diff --git a/res/layout/account_switch_spinner_item.xml b/res/layout/account_switch_spinner_item.xml new file mode 100644 index 000000000..70ad4b978 --- /dev/null +++ b/res/layout/account_switch_spinner_item.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> + +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/AccountSwitchSpinnerItem" + android:layout_height="match_parent" + android:paddingLeft="0dip" + android:layout_marginLeft="0dip"> + + <TextView + android:id="@+id/unread" + android:layout_alignParentRight="true" + android:layout_marginLeft="4dp" + style="@style/UnreadCountActionBar" /> + + <!-- This spacer is here just to soak up horizontal space. --> + <!-- If this is omitted, the spinner triangle is too far from the text. --> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@id/unread"> + + <LinearLayout + android:id="@+id/account_spinner" + style="?android:attr/actionDropDownStyle" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="center_vertical"> + <TextView + android:id="@+id/account_spinner_label" + style="@style/AccountSpinnerAnchorTextPrimary" + android:singleLine="true" + android:ellipsize="end" + android:includeFontPadding="false" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + <TextView + android:id="@+id/account_spinner_account_name" + style="@style/AccountSpinnerAnchorTextSecondary" + android:singleLine="true" + android:ellipsize="end" + android:includeFontPadding="false" + android:layout_marginRight="4dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </LinearLayout> + + </FrameLayout> + +</RelativeLayout> diff --git a/res/layout/actionbar_label.xml b/res/layout/actionbar_label.xml new file mode 100644 index 000000000..5d887d260 --- /dev/null +++ b/res/layout/actionbar_label.xml @@ -0,0 +1,45 @@ +<?xml version="2.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/label_layout" + android:orientation="vertical" + android:gravity="center_vertical" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:layout_marginLeft="4dip"> + <TextView + android:id="@+id/labels" + style="@android:style/TextAppearance.Holo.Widget.ActionBar.Title" + android:singleLine="true" + android:ellipsize="end" + android:includeFontPadding="false" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/labels" /> + <TextView + android:id="@+id/account" + style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle" + android:textColor="@color/actionbar_secondary" + android:singleLine="true" + android:ellipsize="end" + android:includeFontPadding="false" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> +</LinearLayout> diff --git a/res/layout/actionbar_subject.xml b/res/layout/actionbar_subject.xml new file mode 100644 index 000000000..e1424859e --- /dev/null +++ b/res/layout/actionbar_subject.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> + +<com.android.email.browse.SnippetTextView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/conversation_subject" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingRight="@dimen/actionbar_subject_padding_right" + android:includeFontPadding="false" + android:textSize="16dp" + android:gravity="center_vertical" + android:maxLines="2" + android:ellipsize="end" + android:visibility="gone" /> diff --git a/res/layout/actionbar_tests.xml b/res/layout/actionbar_tests.xml new file mode 100644 index 000000000..551731507 --- /dev/null +++ b/res/layout/actionbar_tests.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> +<!-- Test the various modes of the Action bar using buttons rather than actual context. --> + +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/compose_scrollview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="testSetBackButton" + android:text="@string/setBackButton" /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="testRemoveBackButton" + android:text="@string/removeBackButton" /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="testNormalMode" + android:text="@string/normalMode" /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="testSearchResultMode" + android:text="@string/searchResultMode" /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="testLabelMode" + android:text="@string/labelMode" /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="testSearchConversationMode" + android:text="@string/searchConversationMode" /> + </LinearLayout> + +</ScrollView> diff --git a/res/layout/actionbar_view.xml b/res/layout/actionbar_view.xml new file mode 100644 index 000000000..dba2ab173 --- /dev/null +++ b/res/layout/actionbar_view.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> + +<!-- + The custom action bar view Gmail uses (containing drop down account spinner, + label, and subject). +--> +<com.android.email.MailActionBar xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:email="http://schemas.android.com/apk/res/com.android.email" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal" > + + <com.android.email.AccountRecentLabelSpinner + android:id="@+id/account_spinner" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +<!-- email:dropDownWidth="@dimen/account_dropdown_dropdownwidth" /> --> + + <include layout="@layout/actionbar_label" /> + + <include layout="@layout/actionbar_subject" /> + +</com.android.email.MailActionBar> diff --git a/res/layout/attachment.xml b/res/layout/attachment.xml index 3a2f70292..81880f397 100644 --- a/res/layout/attachment.xml +++ b/res/layout/attachment.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. diff --git a/res/layout/cc_bcc_view.xml b/res/layout/cc_bcc_view.xml index 1bd161956..5681cb129 100644 --- a/res/layout/cc_bcc_view.xml +++ b/res/layout/cc_bcc_view.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -67,4 +69,4 @@ <View style="@style/RecipientComposeFieldSpacer"/> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/compose.xml b/res/layout/compose.xml index 68e568530..f0980ad3d 100644 --- a/res/layout/compose.xml +++ b/res/layout/compose.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -73,4 +75,4 @@ </ScrollView> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/compose_body.xml b/res/layout/compose_body.xml index 119cac74d..875ce3e33 100644 --- a/res/layout/compose_body.xml +++ b/res/layout/compose_body.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -20,4 +22,4 @@ style="@style/ComposeBodyStyle" android:hint="@string/body_hint"/> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/compose_from.xml b/res/layout/compose_from.xml index 7c5645fca..154ff3165 100644 --- a/res/layout/compose_from.xml +++ b/res/layout/compose_from.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -46,4 +48,4 @@ </LinearLayout> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/res/layout/compose_recipients.xml b/res/layout/compose_recipients.xml index d8be2bb49..ce8a8528f 100644 --- a/res/layout/compose_recipients.xml +++ b/res/layout/compose_recipients.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -59,4 +61,4 @@ android:imeOptions="actionDone|flagNoExtractUi" style="@style/ComposeEditTextView" /> </RelativeLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/conversation_item_view_normal.xml b/res/layout/conversation_item_view_normal.xml index 94119d052..7664b2db3 100644 --- a/res/layout/conversation_item_view_normal.xml +++ b/res/layout/conversation_item_view_normal.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2011 Google Inc. --> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> <!-- This layout is used as a template to create custom view CanvasConversationHeaderView in normal mode. To be able to get the correct measurements, every source field should @@ -77,4 +92,4 @@ style="@style/StarStyle" android:src="@drawable/btn_star_off_normal_email_holo_light" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/conversation_item_view_wide.xml b/res/layout/conversation_item_view_wide.xml index d5e3a85c4..ca5f58d26 100644 --- a/res/layout/conversation_item_view_wide.xml +++ b/res/layout/conversation_item_view_wide.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2011 Google Inc. --> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> <!-- This layout is used as a template to create custom view CanvasConversationHeaderView in wide mode. To be able to get the correct measurements, every source field should diff --git a/res/layout/email.xml b/res/layout/email.xml index f2fbe3900..357e74329 100644 --- a/res/layout/email.xml +++ b/res/layout/email.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -26,4 +28,4 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> </ListView> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/gmail_actionbar_searchview.xml b/res/layout/gmail_actionbar_searchview.xml new file mode 100644 index 000000000..65b708eb2 --- /dev/null +++ b/res/layout/gmail_actionbar_searchview.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> + +<android.widget.SearchView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/search_layout" + android:gravity="center_vertical" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:hint="@string/search_hint" + android:imeOptions="actionSearch" /> diff --git a/res/layout/label_switch_spinner_dropdown_item.xml b/res/layout/label_switch_spinner_dropdown_item.xml index 3db816bee..135811a45 100644 --- a/res/layout/label_switch_spinner_dropdown_item.xml +++ b/res/layout/label_switch_spinner_dropdown_item.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> @@ -41,4 +39,4 @@ android:id="@+id/unread" style="@style/UnreadCount" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/layout_tests.xml b/res/layout/layout_tests.xml index 77a8306f1..a828da132 100644 --- a/res/layout/layout_tests.xml +++ b/res/layout/layout_tests.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -23,17 +25,17 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical"> - <Button android:id="@+id/compose" + <Button android:text="@string/test_compose" android:layout_height="wrap_content" android:layout_width="wrap_content" android:onClick="composeTest"/> - <Button android:id="@+id/account_spinner" + <Button android:text="@string/test_accountspinner" android:layout_height="wrap_content" android:layout_width="wrap_content" android:onClick="accountSpinnerTest"/> - <Button android:id="@+id/label_spinner" + <Button android:text="@string/test_labelspinner" android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -48,6 +50,10 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:onClick="uiProviderTest" /> + <Button + android:text="@string/test_actionbar" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:onClick="actionbarTest"/> </LinearLayout> - -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/res/layout/mail_browser_link_context_header.xml b/res/layout/mail_browser_link_context_header.xml index 3649176d5..b386e701a 100644 --- a/res/layout/mail_browser_link_context_header.xml +++ b/res/layout/mail_browser_link_context_header.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <!-- The custom header that is used in the context menu that appears when the user long presses @@ -30,4 +28,4 @@ android:maxLines="2" android:paddingLeft="16dip" android:paddingRight="16dip" - />
\ No newline at end of file + /> diff --git a/res/layout/quoted_text.xml b/res/layout/quoted_text.xml index f35c2e23d..c846976dc 100644 --- a/res/layout/quoted_text.xml +++ b/res/layout/quoted_text.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. diff --git a/res/layout/readme.xml b/res/layout/readme.xml index 47b967c9e..fda4580d1 100644 --- a/res/layout/readme.xml +++ b/res/layout/readme.xml @@ -1,7 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> +<!-- UnifiedEmail directory creation --> <View xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" - android:layout_height="wrap_content"/>
\ No newline at end of file + android:layout_height="wrap_content"/> diff --git a/res/menu-sw600dp/compose_menu.xml b/res/menu-sw600dp/compose_menu.xml index 6a0281486..bd11f05e8 100644 --- a/res/menu-sw600dp/compose_menu.xml +++ b/res/menu-sw600dp/compose_menu.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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"> diff --git a/res/menu-sw600dp/conversation_list_menu.xml b/res/menu-sw600dp/conversation_list_menu.xml new file mode 100644 index 000000000..02e0b701c --- /dev/null +++ b/res/menu-sw600dp/conversation_list_menu.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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/compose" + android:title="@string/menu_compose" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_compose_normal_holo_light" + android:alphabeticShortcut="@string/trigger_compose_char" /> + + <item android:id="@+id/search" + android:title="@string/menu_search" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_search_holo_light"/> + + <item android:id="@+id/refresh" + android:title="@string/refresh" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_refresh_holo_light" + android:alphabeticShortcut="@string/trigger_refresh_char" /> + + <item android:id="@+id/label_options" + android:title="@string/menu_manage_labels" + android:icon="@drawable/ic_menu_labels_holo_light" /> + + <item android:id="@+id/preferences" + android:title="@string/menu_preferences" + android:icon="@android:drawable/ic_menu_preferences" /> + + <item + android:id="@+id/help_info_menu_item" + android:icon="@android:drawable/ic_menu_help" + android:title="@string/help_and_info" /> + + <item + android:id="@+id/feedback_menu_item" + android:icon="@android:drawable/ic_menu_send" + android:title="@string/feedback" /> + +</menu> diff --git a/res/menu/compose_menu.xml b/res/menu/compose_menu.xml index b83cde025..44aa4cdaf 100644 --- a/res/menu/compose_menu.xml +++ b/res/menu/compose_menu.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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"> diff --git a/res/menu/conversation_actions.xml b/res/menu/conversation_actions.xml new file mode 100644 index 000000000..6dd6452cd --- /dev/null +++ b/res/menu/conversation_actions.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> +<!-- Action bar items for the tablet when viewing a conversation --> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/y_button" + android:title="@string/archive" + android:showAsAction="ifRoom" + android:icon="@drawable/archive" + android:alphabeticShortcut="@string/trigger_y_char" /> + + <item + android:id="@+id/delete" + android:title="@string/delete" + android:showAsAction="ifRoom" + android:icon="@drawable/trash" /> + + <item + android:id="@+id/change_labels" + android:title="@string/menu_change_labels" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_labels_holo_light" /> + + <item + android:id="@+id/inside_conversation_unread" + android:title="@string/mark_unread" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_mark_unread_holo_light" /> + + <item + android:id="@+id/mark_important" + android:title="@string/mark_important" + android:icon="@drawable/ic_email_caret_double" /> + + <item + android:id="@+id/mark_not_important" + android:title="@string/mark_not_important" + android:icon="@drawable/ic_email_caret_single" + android:visible="false" /> + + <item + android:id="@+id/mute" + android:title="@string/mute" /> + + <item + android:id="@+id/report_spam" + android:title="@string/report_spam" + android:icon="@drawable/ic_spam_normal_holo_light" /> + + <item android:id="@+id/preferences" + android:title="@string/menu_preferences" + android:icon="@android:drawable/ic_menu_preferences" /> + + <item + android:id="@+id/help_info_menu_item" + android:icon="@android:drawable/ic_menu_help" + android:title="@string/help_and_info" /> + + <item + android:id="@+id/feedback_menu_item" + android:icon="@android:drawable/ic_menu_send" + android:title="@string/feedback" /> +</menu> diff --git a/res/menu/conversation_list_menu.xml b/res/menu/conversation_list_menu.xml new file mode 100644 index 000000000..be8a58038 --- /dev/null +++ b/res/menu/conversation_list_menu.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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/compose" + android:title="@string/menu_compose" + android:showAsAction="always" + android:icon="@drawable/ic_menu_compose_normal_holo_light" + android:alphabeticShortcut="@string/trigger_compose_char" /> + + <item android:id="@+id/search" + android:title="@string/menu_search" + android:showAsAction="always|collapseActionView" + android:icon="@drawable/ic_menu_search_holo_light" + android:actionLayout="@layout/gmail_actionbar_searchview" /> + + <item android:id="@+id/show_all_labels" + android:title="@string/show_all_labels" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_labels_holo_light" /> + + <item android:id="@+id/refresh" + android:title="@string/refresh" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_refresh_holo_light" + android:alphabeticShortcut="@string/trigger_refresh_char" /> + + <item android:id="@+id/label_options" + android:title="@string/menu_label_options" + android:showAsAction="never" /> + + <item android:id="@+id/preferences" + android:title="@string/menu_preferences" + android:showAsAction="never" + android:icon="@android:drawable/ic_menu_preferences" /> + + <item + android:id="@+id/help_info_menu_item" + android:icon="@android:drawable/ic_menu_help" + android:showAsAction="never" + android:title="@string/help_and_info" /> + + <item + android:id="@+id/feedback_menu_item" + android:icon="@android:drawable/ic_menu_send" + android:showAsAction="never" + android:title="@string/feedback" /> + +</menu> diff --git a/res/menu/conversation_list_search_results_actions.xml b/res/menu/conversation_list_search_results_actions.xml new file mode 100644 index 000000000..beadac11b --- /dev/null +++ b/res/menu/conversation_list_search_results_actions.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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/compose" + android:title="@string/menu_compose" + android:showAsAction="always" + android:icon="@drawable/ic_menu_compose_normal_holo_light" + android:alphabeticShortcut="@string/trigger_compose_char" /> + + <item android:id="@+id/search" + android:title="@string/menu_search" + android:showAsAction="always|collapseActionView" + android:icon="@drawable/ic_menu_search_holo_light" + android:actionLayout="@layout/gmail_actionbar_searchview" /> + + <item android:id="@+id/show_all_labels" + android:title="@string/show_all_labels" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_labels_holo_light" /> + + <item android:id="@+id/refresh" + android:title="@string/refresh" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_refresh_holo_light" + android:alphabeticShortcut="@string/trigger_refresh_char" /> + + <item android:id="@+id/preferences" + android:title="@string/menu_preferences" + android:showAsAction="never" + android:icon="@android:drawable/ic_menu_preferences" /> + + <item + android:id="@+id/help_info_menu_item" + android:icon="@android:drawable/ic_menu_help" + android:showAsAction="never" + android:title="@string/help_and_info" /> + + <item + android:id="@+id/feedback_menu_item" + android:icon="@android:drawable/ic_menu_send" + android:showAsAction="never" + android:title="@string/feedback" /> + +</menu> diff --git a/res/menu/conversation_list_selection_actions_menu.xml b/res/menu/conversation_list_selection_actions_menu.xml new file mode 100644 index 000000000..d5d8a318e --- /dev/null +++ b/res/menu/conversation_list_selection_actions_menu.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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 for the action mode invoked when items are selected + in the conversation list --> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/y_button" + android:title="@string/archive" + android:showAsAction="ifRoom" + android:icon="@drawable/archive" + android:alphabeticShortcut="@string/trigger_y_char"/> + + <item + android:id="@+id/delete" + android:title="@string/delete" + android:showAsAction="ifRoom" + android:icon="@drawable/trash"/> + + <item + android:id="@+id/change_labels" + android:showAsAction="ifRoom" + android:title="@string/menu_change_labels" + android:icon="@drawable/ic_menu_labels_holo_light" /> + + <item + android:id="@+id/read_unread" + android:title="@string/mark_read" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_mark_unread_holo_light" /> + + <item android:id="@+id/star" + android:title="@string/star" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_menu_star_holo_light" /> + + <item + android:id="@+id/mark_important" + android:title="@string/mark_important" + android:showAsAction="never" + android:icon="@drawable/ic_email_caret_double" /> + + <item + android:id="@+id/mark_not_important" + android:title="@string/mark_not_important" + android:showAsAction="never" + android:icon="@drawable/ic_email_caret_single" /> + + <item + android:id="@+id/mute" + android:title="@string/mute" + android:showAsAction="never" /> + + <item + android:id="@+id/report_spam" + android:title="@string/report_spam" + android:showAsAction="never" + android:icon="@drawable/ic_spam_normal_holo_light" /> + +</menu> diff --git a/res/menu/label_list_menu.xml b/res/menu/label_list_menu.xml new file mode 100644 index 000000000..1a8c6bd64 --- /dev/null +++ b/res/menu/label_list_menu.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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/label_options" + android:title="@string/menu_manage_labels" + android:showAsAction="ifRoom" /> + + <item android:id="@+id/preferences" + android:title="@string/menu_preferences" + android:showAsAction="never" + android:icon="@android:drawable/ic_menu_preferences" /> + + <item + android:id="@+id/help_info_menu_item" + android:icon="@android:drawable/ic_menu_help" + android:showAsAction="never" + android:title="@string/help_and_info" /> + + <item + android:id="@+id/feedback_menu_item" + android:icon="@android:drawable/ic_menu_send" + android:showAsAction="never" + android:title="@string/feedback" /> +</menu> diff --git a/res/menu/webview_context_menu.xml b/res/menu/webview_context_menu.xml index f48ae39e0..200448892 100644 --- a/res/menu/webview_context_menu.xml +++ b/res/menu/webview_context_menu.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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"> diff --git a/res/values-land/dimen.xml b/res/values-land/dimen.xml index 6ab50c0ec..7a3e99f3e 100644 --- a/res/values-land/dimen.xml +++ b/res/values-land/dimen.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources> <dimen name="actionbar_subject_padding_right">0dp</dimen> diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index 2db11d610..001f460f1 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources> <!-- Compose styles --> diff --git a/res/values-sw600dp/arrays.xml b/res/values-sw600dp/arrays.xml index 76467333d..76f3d1a03 100644 --- a/res/values-sw600dp/arrays.xml +++ b/res/values-sw600dp/arrays.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2011, Google Inc. --> +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. +--> <resources> <integer-array name="senders_with_labels_and_attachment_lengths"> @@ -22,4 +37,4 @@ <string-array name="default_recent_labels"> <!-- (empty) --> </string-array> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-sw600dp/colors.xml b/res/values-sw600dp/colors.xml index 963d03bb5..79f6ad41c 100644 --- a/res/values-sw600dp/colors.xml +++ b/res/values-sw600dp/colors.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources> <!-- Conversation List Item Colors --> @@ -25,4 +23,4 @@ <color name="subject_text_color_read">#444444</color> <color name="snippet_text_color_read">#666666</color> <color name="senders_text_color_read">#444444</color> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-sw600dp/constants.xml b/res/values-sw600dp/constants.xml index 76140bd3f..d9523c327 100644 --- a/res/values-sw600dp/constants.xml +++ b/res/values-sw600dp/constants.xml @@ -1,24 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources> <!-- Boolean value indicating whether the table UI should be used. --> <integer name="use_tablet_ui">1</integer> <integer name="conversation_header_mode">1</integer> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml index b58eb01f1..afec463d6 100644 --- a/res/values-sw600dp/dimen.xml +++ b/res/values-sw600dp/dimen.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources> <dimen name="senders_font_size">18sp</dimen> diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml index b75a63801..38a0b8993 100644 --- a/res/values-sw600dp/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources> diff --git a/res/values/animation_constants.xml b/res/values/animation_constants.xml index 04b607f48..a50e6c833 100644 --- a/res/values/animation_constants.xml +++ b/res/values/animation_constants.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -19,4 +21,4 @@ <integer name="fade_duration">250</integer> <integer name="dialog_animationDefaultDur">220</integer> <integer name="dialog_animationShortDur">150</integer> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index b48769c45..5f5b4a974 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -43,4 +45,4 @@ <!-- Drafts --> <item>^r</item> </string-array> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 9c49fb651..1d2bb1037 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -15,14 +17,21 @@ --> <resources> - <add-resource type="style" name="RecipientEditTextViewStyle" /> - <add-resource type="style" name="ComposeEditTextView" /> - <add-resource type="style" name="LargeComposeAreaBody" /> - <add-resource type="style" name="RecipientComposeFieldSpacer" /> - <add-resource type="style" name="ComposeHeading" /> - <add-resource type="style" name="RecipientComposeHeading" /> - <add-resource type="style" name="ComposeFieldLayout" /> - <add-resource type="style" name="RecipientComposeFieldLayout" /> - <add-resource type="style" name="ComposeBodyStyle" /> - <add-resource type="style" name="ComposeSubjectStyle" /> + +<!-- TODO(viki): Figure out how to use attributes. --> +<!-- <declare-styleable name="AccountRecentLabelSpinner"> --> +<!-- <attr format="reference" name="dropDownWidth" /> --> +<!-- </declare-styleable> --> + + <add-resource name="RecipientEditTextViewStyle" type="style" /> + <add-resource name="ComposeEditTextView" type="style" /> + <add-resource name="LargeComposeAreaBody" type="style" /> + <add-resource name="RecipientComposeFieldSpacer" type="style" /> + <add-resource name="ComposeHeading" type="style" /> + <add-resource name="RecipientComposeHeading" type="style" /> + <add-resource name="ComposeFieldLayout" type="style" /> + <add-resource name="RecipientComposeFieldLayout" type="style" /> + <add-resource name="ComposeBodyStyle" type="style" /> + <add-resource name="ComposeSubjectStyle" type="style" /> + </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index f17a1fa5b..06c974cdf 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources> <!-- Conversation List Item Colors --> @@ -41,4 +39,4 @@ <color name="quotedTextColor">#777777</color> <string name="quotedTextBackgroundColorString" translatable="false">#ebebeb</string> <string name="quotedTextFontColorString" translatable="false">#777777</string> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/constants.xml b/res/values/constants.xml index d6fc4c89e..4b968ab04 100644 --- a/res/values/constants.xml +++ b/res/values/constants.xml @@ -1,25 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources> <!-- Boolean value indicating whether the table UI should be used. --> <integer name="use_tablet_ui">0</integer> <integer name="conversation_list_header_mode">1</integer> <integer name="conversation_header_mode">1</integer> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/dimen.xml b/res/values/dimen.xml index 09d0a89e4..51d38fd16 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources> @@ -43,4 +41,5 @@ <dimen name="standard_scaled_dimen">100sp</dimen> <dimen name="label_cell_width">8dip</dimen> <dimen name="triangle_width">15dip</dimen> + <dimen name="label_list_heading_padding_side">8dp</dimen> </resources> diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml index 71066f272..ebd30cf13 100644 --- a/res/values/donottranslate.xml +++ b/res/values/donottranslate.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> diff --git a/res/values/progress_dialog_values.xml b/res/values/progress_dialog_values.xml index b6652a37e..bc179a06e 100644 --- a/res/values/progress_dialog_values.xml +++ b/res/values/progress_dialog_values.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -18,4 +20,4 @@ <integer name="html_conv_progress_wait_time">600</integer> <integer name="batch_progress_display_time">500</integer> <integer name="batch_progress_wait_time">750</integer> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/shortcut_keys.xml b/res/values/shortcut_keys.xml index c18946574..c360f517a 100644 --- a/res/values/shortcut_keys.xml +++ b/res/values/shortcut_keys.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 Google Inc. + Licensed to 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. @@ -24,4 +26,4 @@ <!-- Character, that when combined with CTRL, should trigger the Y button action (sometimes archive, sometimes delete, etc) --> <string name="trigger_y_char" translatable="false">y</string> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 742ae9096..4ae79e54b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> @@ -26,6 +24,7 @@ <string name="test_conversationitems" translate="false">Test Conversation Items</string> <string name="test_endtoend" translate="false">Test End to End with provider</string> <string name="mock_content_provider">Mock Content Provider</string> + <string name="test_actionbar" translate="false">Test Actionbar Layout</string> <string name="app_name">Unified Email</string> @@ -52,10 +51,76 @@ <string name="save">Save draft</string> <!-- Button name: discard this message --> <string name="discard">Discard</string> - <!-- Menu item: launch the Settings activity --> - <string name="menu_preferences">Settings</string> + <!-- Button, star the current conversation --> + <string name="star">Star</string> + <!-- Menu item: send this message --> <string name="send">Send</string> + <!-- Menu item: mark this conversation as read --> + <string name="mark_read">Mark read</string> + <!-- Menu item: mark this conversation as unread --> + <string name="mark_unread">Mark unread</string> + <!-- Menu item: mute this conversation --> + <string name="mute">Mute</string> + <!-- Menu item: add a star to this conversation --> + <string name="add_star">Add star</string> + <!-- Menu item: remove the star from this conversation --> + <string name="remove_star">Remove star</string> + <!-- Menu item: archive this conversation --> + <string name="archive">Archive</string> + <!-- Menu item: report this conversation as spam --> + <string name="report_spam">Report spam</string> + <!-- Menu item: delete this conversation --> + <string name="delete">Delete</string> + <!-- Menu item: next conversation --> + <string name="next">Older</string> + <!-- Menu item: previous conversation --> + <string name="previous">Newer</string> + <!-- Menu item: refresh the inbox --> + <string name="refresh">Refresh</string> + <!-- Menu item: reply to this message --> + <string name="reply">Reply</string> + <!-- Menu item: reply to all recipients in this message [CHAR LIMIT=12] --> + <string name="reply_all">Reply all</string> + <!-- Menu item: resume a draft message [CHAR LIMIT=12] --> + <string name="resume_draft">Edit</string> + <!-- Menu item: forward this message --> + <string name="forward">Forward</string> + <!-- Menu item: compose a new email --> + <string name="menu_compose">Compose</string> + <!-- Menu item: change the labels for this conversion. --> + <string name="menu_change_labels">Change labels</string> + <!-- Menu item: manages the labels for this account. [CHAR LIMIT = 30] --> + <string name="menu_manage_labels">Manage labels</string> + <!-- Title for the Label list screen. [CHAR LIMIT = 30] --> + <string name="label_list_title">Labels</string> + <!-- action bar sub title for manage label mode. [CHAR LIMIT = 30] --> + <string name="manage_labels_subtitle">Sync & notify</string> + <!-- Menu item: options for this label. When source text cannot be translated within the char limit, please translate the shorter "Label options" instead. [CHAR LIMIT = 30] --> + <string name="menu_label_options">Label settings</string> + <!-- Menu item: done editing label options. [CHAR LIMIT = 30] --> + <string name="menu_done">Done</string> + <!-- Menu item: launch the Global Account Settings activity --> + <string name="menu_account_preferences">Account settings</string> + <!-- Menu item: launch the Settings activity --> + <string name="menu_preferences">Settings</string> + <!-- Menu item: search through the Gmail inbox --> + <string name="menu_search">Search</string> + <!-- Menu item: show more menu options in a popup. Portrait mode string. [CHAR LIMIT=15] --> + <string name="more">More</string> + <!-- Menu item: show message number out of total in conversation view [CHAR LIMIT=50]--> + <string name="message_count"><xliff:g id="count">%1$s</xliff:g> of <xliff:g id="total">%2$s</xliff:g></string> + <!-- Menu item: shown in conversation menu. Tap this to move to a newer message. [CHAR LIMIT=20] --> + <string name="newer">Newer</string> + <!-- Menu item: shown in conversation menu. Tap this to move to an older message. [CHAR LIMIT=20] --> + <string name="older">Older</string> + <!-- Menu item: shown in conversation menu. Tap this to move to mark conversation as important [CHAR LIMIT=30] --> + + <!-- Menu item: shown in conversation menu. Tap this to move to mark conversation as important [CHAR LIMIT=30] --> + <string name="mark_important">Mark important</string> + <!-- Menu item: shown in conversation menu. Tap this to move to mark conversation as not important [CHAR LIMIT=30] --> + <string name="mark_not_important">Mark not important</string> + <!-- Compose screen, menu item: add Cc/Bcc fields --> <string name="add_cc_label">Add Cc/Bcc</string> <!-- Compose screen, menu item: add Bcc field [CHAR_LIMIT=20]--> @@ -97,6 +162,8 @@ <!-- Attachment description for unknown files [CHAR LIMIT=30]--> <string name="attachment_unknown"><xliff:g id="attachmentExtension">%s</xliff:g> File</string> + <!-- Shown in light gray in the Search box when no text has been entered [CHAR LIMIT=30] --> + <string name="search_hint">Search mail</string> <!-- Webview Context Menu Strings --> <!-- Title of dialog for choosing which activity to share a link with. [CHAR LIMIT=50]--> @@ -153,6 +220,9 @@ <string name="send_failed">Message wasn\'t sent.</string> <!-- Strings used to show myself in a To/Cc list. [CHAR LIMIT=15] --> <string name="me">me</string> + <string name="labels">Labels</string> + <!-- List item to open label view in account dropdown [CHAR LIMIT=50] --> + <string name="show_all_labels">Show all labels</string> <!-- Undo bar strings --> <!-- Displayed in the middle of the screen when the inbox is empty [CHAR LIMIT 100]--> @@ -293,4 +363,15 @@ <!-- Displayed while adding and removing labels to multiple conversations. [CHAR LIMIT=100] --> <item quantity="other">Changed labels.</item> </plurals> -</resources>
\ No newline at end of file + + <string name="searchMode" translate="false">Search Mode</string> + <string name="searchConversationMode" translate="false">Search Conversation Mode</string> + <string name="setBackButton" translate="false">Set Back Button</string> + <string name="removeBackButton" translate="false">Remove Back Button</string> + <string name="normalMode" translate="false">Set Normal Mode</string> + <string name="searchResultMode" translate="false">Search Result Mode</string> + <string name="labelMode" translate="false">Set Label Mode</string> + + <!-- List header for recent labels for current account in account dropdown [CHAR LIMIT=100] --> + <string name="recent_labels">Recent</string> +</resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index e860dba4c..268d324cd 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,21 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* - * Copyright (C) 2011 Google Inc. - * Licensed to 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. - */ + Copyright (C) 2011 Google Inc. + Licensed to 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. --> <resources> <!-- Compose Styles --> |