Removing unused cling resources.
Change-Id: I97ff14f436f75a6345f719ef19146b02087e2221
|
Before Width: | Height: | Size: 659 B |
|
Before Width: | Height: | Size: 638 B |
|
Before Width: | Height: | Size: 769 B |
|
Before Width: | Height: | Size: 647 B |
|
Before Width: | Height: | Size: 284 B |
|
Before Width: | Height: | Size: 521 B |
|
Before Width: | Height: | Size: 493 B |
|
Before Width: | Height: | Size: 540 B |
|
Before Width: | Height: | Size: 512 B |
|
Before Width: | Height: | Size: 450 B |
|
Before Width: | Height: | Size: 453 B |
|
Before Width: | Height: | Size: 671 B |
|
Before Width: | Height: | Size: 639 B |
|
Before Width: | Height: | Size: 765 B |
|
Before Width: | Height: | Size: 509 B |
|
Before Width: | Height: | Size: 484 B |
|
Before Width: | Height: | Size: 621 B |
|
Before Width: | Height: | Size: 815 B |
|
Before Width: | Height: | Size: 794 B |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 535 B |
|
Before Width: | Height: | Size: 517 B |
|
Before Width: | Height: | Size: 617 B |
|
Before Width: | Height: | Size: 537 B |
|
Before Width: | Height: | Size: 178 B |
|
Before Width: | Height: | Size: 236 B |
|
Before Width: | Height: | Size: 485 B |
|
Before Width: | Height: | Size: 455 B |
|
Before Width: | Height: | Size: 486 B |
|
Before Width: | Height: | Size: 473 B |
|
Before Width: | Height: | Size: 356 B |
|
Before Width: | Height: | Size: 352 B |
|
Before Width: | Height: | Size: 955 B |
|
Before Width: | Height: | Size: 949 B |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 986 B |
|
Before Width: | Height: | Size: 327 B |
|
Before Width: | Height: | Size: 602 B |
|
Before Width: | Height: | Size: 618 B |
|
Before Width: | Height: | Size: 629 B |
|
Before Width: | Height: | Size: 602 B |
|
Before Width: | Height: | Size: 558 B |
|
Before Width: | Height: | Size: 558 B |
|
Before Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
@@ -57,15 +57,6 @@
|
||||
android:id="@+id/overview_panel"
|
||||
android:visibility="gone" />
|
||||
|
||||
<!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure
|
||||
that it is still visible during the transition to AllApps and doesn't overlay on
|
||||
top of that view. -->
|
||||
<com.android.launcher3.ScrimView
|
||||
android:id="@+id/cling_scrim"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="gone" />
|
||||
|
||||
<include layout="@layout/apps_customize_pane"
|
||||
android:id="@+id/apps_customize_pane"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -65,15 +65,6 @@
|
||||
android:id="@+id/search_drop_target_bar"
|
||||
layout="@layout/search_drop_target_bar" />
|
||||
|
||||
<!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure
|
||||
that it is still visible during the transition to AllApps and doesn't overlay on
|
||||
top of that view. -->
|
||||
<com.android.launcher3.ScrimView
|
||||
android:id="@+id/cling_scrim"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="gone" />
|
||||
|
||||
<!-- This is the search bar voice button proxy view. It allows us to have a larger
|
||||
touch target than the microphone constrained by the search bar bounds. -->
|
||||
<com.android.launcher3.DrawableStateProxyView
|
||||
|
||||
@@ -66,15 +66,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal" />
|
||||
|
||||
<!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure
|
||||
that it is still visible during the transition to AllApps and doesn't overlay on
|
||||
top of that view. -->
|
||||
<com.android.launcher3.ScrimView
|
||||
android:id="@+id/cling_scrim"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="gone" />
|
||||
|
||||
<com.android.launcher3.DrawableStateProxyView
|
||||
android:id="@+id/voice_button_proxy"
|
||||
android:layout_width="0dp"
|
||||
|
||||
@@ -49,8 +49,6 @@
|
||||
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>
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
<?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.
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<!-- Cling -->
|
||||
<dimen name="cling_title_text_size">22sp</dimen>
|
||||
<dimen name="cling_text_size">16sp</dimen>
|
||||
<dimen name="cling_alt_title_text_size">30sp</dimen>
|
||||
<dimen name="cling_alt_text_size">16sp</dimen>
|
||||
<dimen name="cling_hint_text_size">18sp</dimen>
|
||||
</resources>
|
||||
@@ -23,6 +23,4 @@
|
||||
<dimen name="apps_customize_tab_bar_height">42dp</dimen>
|
||||
<integer name="apps_customize_widget_cell_count_x">3</integer>
|
||||
<integer name="apps_customize_widget_cell_count_y">2</integer>
|
||||
<integer name="apps_customize_cling_focused_x">2</integer>
|
||||
<integer name="apps_customize_cling_focused_y">1</integer>
|
||||
</resources>
|
||||
|
||||
@@ -16,9 +16,6 @@
|
||||
|
||||
<resources>
|
||||
<!-- AppsCustomize -->
|
||||
<integer name="apps_customize_cling_focused_x">1</integer>
|
||||
<integer name="apps_customize_cling_focused_y">1</integer>
|
||||
|
||||
<integer name="apps_customize_widget_cell_count_x">2</integer>
|
||||
<integer name="apps_customize_widget_cell_count_y">3</integer>
|
||||
</resources>
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 201 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>
|
||||
<!-- Clings -->
|
||||
<dimen name="folderClingMarginTop">50dp</dimen>
|
||||
</resources>
|
||||
@@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2011 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>
|
||||
<!-- Clings -->
|
||||
<dimen name="folderClingMarginTop">70dp</dimen>
|
||||
</resources>
|
||||
@@ -2,9 +2,6 @@
|
||||
<bool name="is_tablet">true</bool>
|
||||
<bool name="allow_rotation">true</bool>
|
||||
|
||||
<!-- Whether or not to use custom clings if a custom workspace layout is passed in -->
|
||||
<bool name="config_useCustomClings">true</bool>
|
||||
|
||||
<!-- DragController -->
|
||||
<integer name="config_flingToDeleteMinVelocity">-1000</integer>
|
||||
|
||||
|
||||
@@ -18,15 +18,8 @@
|
||||
<!-- AppsCustomize -->
|
||||
<integer name="apps_customize_widget_cell_count_x">4</integer>
|
||||
<integer name="apps_customize_widget_cell_count_y">2</integer>
|
||||
<integer name="apps_customize_cling_focused_x">4</integer>
|
||||
<integer name="apps_customize_cling_focused_y">2</integer>
|
||||
|
||||
<!-- the area at the edge of the screen that makes the workspace go left
|
||||
or right while you're dragging. -->
|
||||
<dimen name="scroll_zone">100dip</dimen>
|
||||
|
||||
<!-- Cling -->
|
||||
<!-- The offset for the text in the cling -->
|
||||
<dimen name="cling_text_block_offset_x">140dp</dimen>
|
||||
<dimen name="cling_text_block_offset_y">80dp</dimen>
|
||||
</resources>
|
||||
|
||||
@@ -19,12 +19,4 @@
|
||||
<!-- the area at the edge of the screen that makes the workspace go left
|
||||
or right while you're dragging. -->
|
||||
<dimen name="scroll_zone">40dp</dimen>
|
||||
|
||||
<integer name="apps_customize_cling_focused_x">2</integer>
|
||||
<integer name="apps_customize_cling_focused_y">2</integer>
|
||||
|
||||
<!-- Cling -->
|
||||
<!-- The offset for the text in the cling -->
|
||||
<dimen name="cling_text_block_offset_x">80dp</dimen>
|
||||
<dimen name="cling_text_block_offset_y">160dp</dimen>
|
||||
</resources>
|
||||
|
||||
@@ -114,10 +114,6 @@
|
||||
<attr name="widgetCountX" format="integer" />
|
||||
<!-- Number of widgets vertically -->
|
||||
<attr name="widgetCountY" format="integer" />
|
||||
<!-- The x index of the item to be focused in the cling -->
|
||||
<attr name="clingFocusedX" format="integer" />
|
||||
<!-- The y index of the item to be focused in the cling -->
|
||||
<attr name="clingFocusedY" format="integer" />
|
||||
</declare-styleable>
|
||||
|
||||
<!-- XML attributes used by default_workspace.xml -->
|
||||
@@ -147,10 +143,4 @@
|
||||
<attr name="ringOutset" format="dimension" />
|
||||
<attr name="indicatorSize" format="dimension" />
|
||||
</declare-styleable>
|
||||
|
||||
<!-- Only used in the device overlays -->
|
||||
<declare-styleable name="CustomClingTitleText">
|
||||
</declare-styleable>
|
||||
<declare-styleable name="CustomClingText">
|
||||
</declare-styleable>
|
||||
</resources>
|
||||
|
||||
@@ -93,9 +93,6 @@
|
||||
<!-- Camera distance for the overscroll effect -->
|
||||
<integer name="config_cameraDistance">8000</integer>
|
||||
|
||||
<!-- Whether or not to use custom clings if a custom workspace layout is passed in -->
|
||||
<bool name="config_useCustomClings">false</bool>
|
||||
|
||||
<!-- Hotseat -->
|
||||
<bool name="hotseat_transpose_layout_with_orientation">true</bool>
|
||||
|
||||
|
||||
@@ -34,22 +34,6 @@
|
||||
<dimen name="cling_migration_bg_size">400dp</dimen>
|
||||
<dimen name="cling_migration_bg_shift">-200dp</dimen>
|
||||
|
||||
<dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
|
||||
<dimen name="folderClingMarginTop">20dp</dimen>
|
||||
<!-- The offset for the text in the cling -->
|
||||
<dimen name="cling_text_block_offset_x">0dp</dimen>
|
||||
<dimen name="cling_text_block_offset_y">0dp</dimen>
|
||||
<!-- entries for custom clings, will be set in overlays -->
|
||||
<add-resource type="dimen" name="custom_cling_margin_top" />
|
||||
<add-resource type="dimen" name="custom_cling_margin_right" />
|
||||
<add-resource type="dimen" name="custom_cling_margin_left" />
|
||||
|
||||
<dimen name="cling_title_text_size">20sp</dimen>
|
||||
<dimen name="cling_text_size">14sp</dimen>
|
||||
<dimen name="cling_alt_title_text_size">24sp</dimen>
|
||||
<dimen name="cling_alt_text_size">16sp</dimen>
|
||||
<dimen name="cling_hint_text_size">14sp</dimen>
|
||||
|
||||
<!-- Workspace -->
|
||||
<dimen name="workspace_max_gap">16dp</dimen>
|
||||
<dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
|
||||
|
||||
@@ -127,10 +127,6 @@
|
||||
</style>
|
||||
|
||||
<!-- Overridden in device overlays -->
|
||||
<style name="CustomClingTitleText">
|
||||
</style>
|
||||
<style name="CustomClingText">
|
||||
</style>
|
||||
<style name="PagedViewWidgetImageView">
|
||||
<item name="android:paddingLeft">@dimen/app_widget_preview_padding_left</item>
|
||||
</style>
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2011 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.
|
||||
*/
|
||||
|
||||
package com.android.launcher3;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Rect;
|
||||
import android.util.AttributeSet;
|
||||
import android.widget.FrameLayout;
|
||||
|
||||
public class ScrimView extends FrameLayout implements Insettable {
|
||||
|
||||
public ScrimView(Context context) {
|
||||
this(context, null, 0);
|
||||
}
|
||||
|
||||
public ScrimView(Context context, AttributeSet attrs) {
|
||||
this(context, attrs, 0);
|
||||
}
|
||||
|
||||
public ScrimView(Context context, AttributeSet attrs, int defStyle) {
|
||||
super(context, attrs, defStyle);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setInsets(Rect insets) {
|
||||
// Do nothing
|
||||
}
|
||||
}
|
||||