aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaking widget grid to show more items

Browse Source 
Change-Id: Ied035f6c01f062ac1b4b16ee0a5b9029c6da72a0
This commit is contained in:
Winson Chung
2011-08-11 15:12:11 -07:00
parent 981b8a3708
commit 35d4a257cf
10 changed files with 120 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
res/layout-xlarge/apps_customize_widget.xml Normal file
View File

@@ -0,0 +1,80 @@
<?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.
-->
<com.android.launcher2.PagedViewWidget
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
launcher:blurColor="#FF6B8CF0"
launcher:outlineColor="#FF8CD2FF"
android:background="@drawable/focusable_view_bg"
android:focusable="true">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:orientation="vertical"
android:background="@drawable/widget_info_bg">
<!-- The name of the widget. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="left|bottom"
android:singleLine="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:textColor="#FFBBBBBB"
android:textSize="14sp"
android:shadowColor="#FF000000"
android:shadowDx="0.0"
android:shadowDy="1.0"
android:shadowRadius="1.0" />
<!-- The original dimensions of the widget (can't be the same text as above due to different
style. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget_dims"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="left|bottom"
android:textColor="#FF999999"
android:textSize="12sp"
android:shadowColor="#99000000"
android:shadowDx="0.0"
android:shadowDy="1.0"
android:shadowRadius="1.0" />
</LinearLayout>
<!-- The icon of the widget. -->
<ImageView
android:id="@+id/widget_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:adjustViewBounds="true"
android:scaleType="fitStart" />
</com.android.launcher2.PagedViewWidget>

14
res/layout/apps_customize_widget.xml
View File

@@ -29,18 +29,18 @@
android:focusable="true">
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:orientation="vertical"
android:orientation="horizontal"
android:background="@drawable/widget_info_bg">
<!-- The name of the widget. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="left|bottom"
android:layout_weight="1"
android:gravity="left"
android:singleLine="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
@@ -58,10 +58,12 @@
android:id="@+id/widget_dims"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="5dp"
android:layout_weight="0"
android:gravity="left|bottom"
android:gravity="left"
android:textColor="#FF999999"
android:textColor="#FF666666"
android:textSize="12sp"
android:shadowColor="#99000000"
android:shadowDx="0.0"

2
res/values-land/dimens.xml
View File

@@ -60,5 +60,5 @@
<dimen name="apps_customize_widget_cell_width_gap">30dp</dimen>
<dimen name="apps_customize_widget_cell_height_gap">5dp</dimen>
<integer name="apps_customize_widget_cell_count_x">3</integer>
<integer name="apps_customize_widget_cell_count_y">1</integer>
<integer name="apps_customize_widget_cell_count_y">2</integer>
</resources>

2
res/values-large-land/dimens.xml
View File

@@ -35,4 +35,6 @@
<dimen name="apps_customize_pageLayoutPaddingBottom">14dp</dimen>
<dimen name="apps_customize_pageLayoutPaddingLeft">40dp</dimen>
<dimen name="apps_customize_pageLayoutPaddingRight">40dp</dimen>
<integer name="apps_customize_widget_cell_count_x">3</integer>
<integer name="apps_customize_widget_cell_count_y">2</integer>
</resources>

2
res/values-large-port/dimens.xml
View File

@@ -38,4 +38,6 @@
<dimen name="apps_customize_pageLayoutPaddingBottom">10dp</dimen>
<dimen name="apps_customize_pageLayoutPaddingLeft">10dp</dimen>
<dimen name="apps_customize_pageLayoutPaddingRight">10dp</dimen>
<integer name="apps_customize_widget_cell_count_x">2</integer>
<integer name="apps_customize_widget_cell_count_y">3</integer>
</resources>

2
res/values-port/dimens.xml
View File

@@ -36,5 +36,5 @@
<dimen name="apps_customize_widget_cell_width_gap">20dp</dimen>
<dimen name="apps_customize_widget_cell_height_gap">10dp</dimen>
<integer name="apps_customize_widget_cell_count_x">2</integer>
<integer name="apps_customize_widget_cell_count_y">2</integer>
<integer name="apps_customize_widget_cell_count_y">3</integer>
</resources>

20
res/values-xlarge-land/dimens.xml Normal file
View File

@@ -0,0 +1,20 @@
<?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>
<integer name="apps_customize_widget_cell_count_x">4</integer>
<integer name="apps_customize_widget_cell_count_y">2</integer>
</resources>

2
res/values-xlarge-port/dimens.xml
View File

@@ -18,4 +18,6 @@
<!-- We can also afford to have a slightly wider portrait layout in
xlarge -->
<dimen name="apps_customize_pageLayoutWidthGap">36dp</dimen>
<integer name="apps_customize_widget_cell_count_x">3</integer>
<integer name="apps_customize_widget_cell_count_y">3</integer>
</resources>

2
src/com/android/launcher2/AppsCustomizePagedView.java
View File

@@ -282,8 +282,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
mWidgetSpacingLayout.calculateCellCount(width, height, maxCellCountX, maxCellCountY);
mCellCountX = mWidgetSpacingLayout.getCellCountX();
mCellCountY = mWidgetSpacingLayout.getCellCountY();
mWidgetCountX = Math.max(1, (int) Math.round(mCellCountX / 2f));
mWidgetCountY = Math.max(1, (int) Math.round(mCellCountY / 3f));
// Force a measure to update recalculate the gaps
int widthSpec = MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.AT_MOST);

6
src/com/android/launcher2/PagedViewWidget.java
View File

@@ -111,8 +111,10 @@ public class PagedViewWidget extends LinearLayout implements Checkable {
name.setText(info.label);
name.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
final TextView dims = (TextView) findViewById(R.id.widget_dims);
dims.setText(String.format(mDimensionsFormatString, cellSpan[0], cellSpan[1]));
dims.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
if (dims != null) {
dims.setText(String.format(mDimensionsFormatString, cellSpan[0], cellSpan[1]));
dims.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
}
}
public void applyFromResolveInfo(PackageManager pm, ResolveInfo info,