aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 18:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Updating folder UI when icons are normalized > Increasing padding > Making the folder label bold and lighter color" into ub-launcher3-burnaby-polish

Browse Source
This commit is contained in:
Sunny Goyal
2016-02-03 19:32:02 +00:00
committed by Android (Google) Code Review
parent 2113c9d664 5c556e7226
commit 0e04980310
2 changed files with 89 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
res/layout/user_folder_icon_normalized.xml Normal file
View File

@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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.Folder xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/quantum_panel"
android:elevation="5dp"
android:orientation="vertical" >
<FrameLayout
android:id="@+id/folder_content_wrapper"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<!-- Actual size of the indicator doesn't matter as it is scaled to match the view size -->
<com.android.launcher3.FocusIndicatorView
android:id="@+id/focus_indicator"
android:layout_width="20dp"
android:layout_height="20dp" />
<com.android.launcher3.FolderPagedView
android:id="@+id/folder_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
launcher:pageIndicator="@+id/folder_page_indicator" />
</FrameLayout>
<LinearLayout
android:id="@+id/folder_footer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:orientation="horizontal"
android:paddingLeft="8dp"
android:paddingRight="8dp" >
<com.android.launcher3.ExtendedEditText
android:id="@+id/folder_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="#00000000"
android:fontFamily="sans-serif-condensed"
android:textStyle="bold"
android:gravity="center_horizontal"
android:hint="@string/folder_hint_text"
android:imeOptions="flagNoExtractUi"
android:paddingBottom="12dp"
android:paddingTop="4dp"
android:singleLine="true"
android:textColor="#EE777777"
android:textColorHighlight="#ffCCCCCC"
android:textColorHint="#ff808080"
android:textSize="14sp" />
<include
android:id="@+id/folder_page_indicator"
android:layout_width="wrap_content"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
layout="@layout/page_indicator" />
</LinearLayout>
</com.android.launcher3.Folder>

5
src/com/android/launcher3/Folder.java
View File

@@ -57,6 +57,7 @@ import com.android.launcher3.FolderInfo.FolderListener;
import com.android.launcher3.UninstallDropTarget.UninstallSource;
import com.android.launcher3.Workspace.ItemOperator;
import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.AccessibilityDragSource;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.util.Thunk;
import com.android.launcher3.util.UiThreadCircularReveal;
@@ -421,7 +422,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
*/
@SuppressLint("InflateParams")
static Folder fromXml(Launcher launcher) {
return (Folder) launcher.getLayoutInflater().inflate(R.layout.user_folder, null);
return (Folder) launcher.getLayoutInflater().inflate(
FeatureFlags.LAUNCHER3_ICON_NORMALIZATION
? R.layout.user_folder_icon_normalized : R.layout.user_folder, null);
}
/**