diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/all_apps_button.xml | 3 | ||||
| -rw-r--r-- | res/layout/application.xml | 3 | ||||
| -rw-r--r-- | res/layout/apps_customize_application.xml | 11 | ||||
| -rw-r--r-- | res/layout/apps_customize_pane.xml | 71 | ||||
| -rw-r--r-- | res/layout/apps_customize_widget.xml | 51 | ||||
| -rw-r--r-- | res/layout/appwidget_not_ready.xml | 20 | ||||
| -rw-r--r-- | res/layout/custom_content_page_indicator_marker.xml | 39 | ||||
| -rw-r--r-- | res/layout/folder_application.xml | 19 | ||||
| -rw-r--r-- | res/layout/folder_icon.xml | 3 | ||||
| -rw-r--r-- | res/layout/longpress_cling_content.xml | 43 | ||||
| -rw-r--r-- | res/layout/longpress_cling_welcome_content.xml | 54 | ||||
| -rw-r--r-- | res/layout/user_folder.xml | 2 |
12 files changed, 205 insertions, 114 deletions
diff --git a/res/layout/all_apps_button.xml b/res/layout/all_apps_button.xml index 1b9ea082f..9d6d82bb2 100644 --- a/res/layout/all_apps_button.xml +++ b/res/layout/all_apps_button.xml @@ -16,5 +16,4 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon" - android:focusable="true" - android:background="@drawable/focusable_view_bg" /> + android:focusable="true" /> diff --git a/res/layout/application.xml b/res/layout/application.xml index e4909ddad..c21dea070 100644 --- a/res/layout/application.xml +++ b/res/layout/application.xml @@ -16,5 +16,4 @@ <com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon" - android:focusable="true" - android:background="@drawable/focusable_view_bg" /> + android:focusable="true" /> diff --git a/res/layout/apps_customize_application.xml b/res/layout/apps_customize_application.xml index 3b0fa6f4e..c56cdf3d2 100644 --- a/res/layout/apps_customize_application.xml +++ b/res/layout/apps_customize_application.xml @@ -14,15 +14,8 @@ limitations under the License. --> -<com.android.launcher3.PagedViewIcon +<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - style="@style/WorkspaceIcon.AppsCustomize" - android:id="@+id/application_icon" - android:layout_width="match_parent" - android:layout_height="match_parent" - - android:focusable="true" - android:background="@drawable/focusable_view_bg" /> + android:focusable="true" /> diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index eae216e93..bf5f71b90 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -16,64 +16,47 @@ <com.android.launcher3.AppsCustomizeTabHost xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:background="#80FFFFFF"> + android:clipChildren="false"> + <LinearLayout - android:id="@+id/apps_customize_content" - android:orientation="vertical" + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone"> - <!-- The layout_width of the tab bar gets overriden to align the content - with the text in the tabs in AppsCustomizeTabHost. --> + android:clipChildren="false" + android:orientation="vertical"> + <FrameLayout - android:id="@+id/tabs_container" - android:layout_width="wrap_content" - android:layout_height="@dimen/apps_customize_tab_bar_height" - android:layout_marginTop="@dimen/apps_customize_tab_bar_margin_top" - android:layout_gravity="center_horizontal" - android:visibility="gone"> - <com.android.launcher3.FocusOnlyTabWidget - android:id="@android:id/tabs" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:clipChildren="false"> + <FrameLayout + android:id="@+id/fake_page_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="start" - android:background="@drawable/tab_unselected_holo" - android:tabStripEnabled="false" - android:divider="@null" /> - <include - android:id="@+id/market_button" - layout="@layout/market_button" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="end" /> - </FrameLayout> - <FrameLayout - android:id="@android:id/tabcontent" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:clipChildren="false" + android:clipToPadding="false"> + <FrameLayout + android:id="@+id/fake_page" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="invisible" + android:clipToPadding="false" /> + </FrameLayout> <com.android.launcher3.AppsCustomizePagedView android:id="@+id/apps_customize_pane_content" android:layout_width="match_parent" android:layout_height="match_parent" launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" - launcher:clingFocusedX="@integer/apps_customize_cling_focused_x" - launcher:clingFocusedY="@integer/apps_customize_cling_focused_y" launcher:maxGap="@dimen/workspace_max_gap" launcher:pageIndicator="@+id/apps_customize_page_indicator" /> - <FrameLayout - android:id="@+id/animation_buffer" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="#FF000000" - android:visibility="gone" /> - <include - android:id="@+id/apps_customize_page_indicator" - layout="@layout/page_indicator" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" /> </FrameLayout> + <include + android:id="@+id/apps_customize_page_indicator" + layout="@layout/page_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> </LinearLayout> </com.android.launcher3.AppsCustomizeTabHost> diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml index 7c98b4a9b..e299b32b0 100644 --- a/res/layout/apps_customize_widget.xml +++ b/res/layout/apps_customize_widget.xml @@ -25,24 +25,45 @@ android:background="@drawable/focusable_view_bg" android:focusable="true"> - <!-- The preview of the widget or shortcut. --> - <com.android.launcher3.PagedViewWidgetImageView - android:id="@+id/widget_preview" - style="@style/PagedViewWidgetImageView" + <LinearLayout + android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="@dimen/app_widget_preview_padding_top" - android:paddingEnd="@dimen/app_widget_preview_padding_right" - android:paddingRight="@dimen/app_widget_preview_padding_right" - android:scaleType="matrix" - android:background="@drawable/screenpanel" /> + android:layout_weight="1"> + <FrameLayout + android:id="@+id/left_border" + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@color/widget_text_panel" + android:visibility="gone" /> + + <!-- The preview of the widget or shortcut. --> + <com.android.launcher3.PagedViewWidgetImageView + android:id="@+id/widget_preview" + style="@style/PagedViewWidgetImageView" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingTop="@dimen/app_widget_preview_padding_top" + android:paddingEnd="@dimen/app_widget_preview_padding_right" + android:paddingRight="@dimen/app_widget_preview_padding_right" + android:scaleType="matrix" /> + <FrameLayout + android:id="@+id/right_border" + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@color/widget_text_panel" + android:visibility="gone" /> + </LinearLayout> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/app_widget_preview_label_margin_top" - android:layout_marginStart="@dimen/app_widget_preview_label_margin_left" - android:layout_marginEnd="@dimen/app_widget_preview_label_margin_right" + android:paddingTop="@dimen/app_widget_preview_label_vertical_padding" + android:paddingBottom="@dimen/app_widget_preview_label_vertical_padding" + android:paddingLeft="@dimen/app_widget_preview_label_horizontal_padding" + android:paddingRight="@dimen/app_widget_preview_label_horizontal_padding" + android:background="@color/widget_text_panel" android:orientation="horizontal"> <!-- The name of the widget. --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" @@ -56,7 +77,7 @@ android:fadingEdge="horizontal" android:textColor="#FFFFFFFF" - android:textSize="13sp" + android:textSize="12sp" android:textAlignment="viewStart" android:fontFamily="sans-serif-condensed" android:shadowRadius="2.0" @@ -73,7 +94,7 @@ android:layout_weight="0" android:gravity="start" - android:textColor="#FFAAAAAA" + android:textColor="#FFFFFFFF" android:textSize="12sp" android:fontFamily="sans-serif-condensed" android:shadowRadius="2.0" diff --git a/res/layout/appwidget_not_ready.xml b/res/layout/appwidget_not_ready.xml new file mode 100644 index 000000000..be7c33b36 --- /dev/null +++ b/res/layout/appwidget_not_ready.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2009 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. +--> + +<View xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" /> diff --git a/res/layout/custom_content_page_indicator_marker.xml b/res/layout/custom_content_page_indicator_marker.xml deleted file mode 100644 index 8fe3f8fdf..000000000 --- a/res/layout/custom_content_page_indicator_marker.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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.launcher3.PageIndicatorMarker - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:layout_width="16dp" - android:layout_height="16dp" - android:layout_gravity="center_vertical"> - <ImageView - android:id="@+id/inactive" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerInside" - android:src="@drawable/custom_content_page" - /> - <ImageView - android:id="@+id/active" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerInside" - android:src="@drawable/custom_content_page" - android:alpha="0" - android:scaleX="0.5" - android:scaleY="0.5" - /> -</com.android.launcher3.PageIndicatorMarker> diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml new file mode 100644 index 000000000..b48b61331 --- /dev/null +++ b/res/layout/folder_application.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/WorkspaceIcon.Folder" + android:focusable="true" /> diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml index 5147f9960..fd45d7685 100644 --- a/res/layout/folder_icon.xml +++ b/res/layout/folder_icon.xml @@ -19,8 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:focusable="true" - android:background="@drawable/focusable_view_bg"> + android:focusable="true" > <ImageView android:id="@+id/preview_background" android:layout_gravity="center_horizontal" diff --git a/res/layout/longpress_cling_content.xml b/res/layout/longpress_cling_content.xml new file mode 100644 index 000000000..47a8e9797 --- /dev/null +++ b/res/layout/longpress_cling_content.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="24dp" + android:paddingTop="36dp" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="36dp" + android:paddingRight="36dp" + android:text="@string/workspace_cling_longpress_title" + android:textColor="#E1000000" + android:textSize="24sp" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:paddingLeft="36dp" + android:paddingRight="36dp" + android:text="@string/workspace_cling_longpress_description" + android:textColor="#99000000" + android:textSize="16sp" /> + + <Button + android:id="@+id/cling_dismiss_longpress_info" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:layout_marginRight="12dp" + android:layout_marginTop="27dp" + android:fontFamily="sans-serif-medium" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:text="@string/workspace_cling_longpress_dismiss" + android:textColor="#FFFFFFFF" + android:textSize="14sp" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/longpress_cling_welcome_content.xml b/res/layout/longpress_cling_welcome_content.xml new file mode 100644 index 000000000..dd4f8d767 --- /dev/null +++ b/res/layout/longpress_cling_welcome_content.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="24dp" + android:paddingTop="36dp" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:paddingLeft="36dp" + android:paddingRight="36dp" + android:text="@string/first_run_cling_title" + android:textColor="#E1000000" + android:textSize="34sp" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="5.3dp" + android:fontFamily="sans-serif-medium" + android:paddingLeft="36dp" + android:paddingRight="36dp" + android:text="@string/workspace_cling_longpress_title" + android:textColor="#E1000000" + android:textSize="20sp" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="36dp" + android:paddingRight="36dp" + android:text="@string/workspace_cling_longpress_description" + android:textColor="#99000000" + android:textSize="16sp" /> + + <Button + android:id="@+id/cling_dismiss_longpress_info" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:layout_marginRight="12dp" + android:layout_marginTop="27dp" + android:fontFamily="sans-serif-medium" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:text="@string/workspace_cling_longpress_dismiss" + android:textColor="#FFFFFFFF" + android:textSize="14sp" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 5d5f33b1f..4e5303ac0 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - android:background="@drawable/portal_container_holo"> + android:background="@drawable/quantum_panel"> <ScrollView android:id="@+id/scroll_view" |