mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 18:58:19 +00:00
01b8b68db7
A previous change [1] introduced the material library as a static library for the SecondaryDisplayLauncher. The material library defines a resource "attr/iconSize" with format="dimension" while Launcher3 defines a resource of the same name with format="float". The material resource is being overriden by the Launcher3 resource and is preventing aapt2 from disallowing multiple definitions of the same attribute with different formats. This change renames the Launcher3 iconSize so it will not collide with the material resource. [1] If183dd35a1d197c4a9a8225a021e36c4f1662587 Bug: 129146717 Test: build success and inspection of generated apk Change-Id: I5eb54ea606ddcfb47d5150b44906a8707203e905
125 lines
4.0 KiB
XML
125 lines
4.0 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2016 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.
|
|
-->
|
|
|
|
<profiles xmlns:launcher="http://schemas.android.com/apk/res-auto" >
|
|
|
|
<grid-option
|
|
launcher:name="3_by_3"
|
|
launcher:numRows="3"
|
|
launcher:numColumns="3"
|
|
launcher:numFolderRows="2"
|
|
launcher:numFolderColumns="3"
|
|
launcher:numHotseatIcons="3"
|
|
launcher:defaultLayoutId="@xml/default_workspace_3x3" >
|
|
|
|
<display-option
|
|
launcher:name="Super Short Stubby"
|
|
launcher:minWidthDps="255"
|
|
launcher:minHeightDps="300"
|
|
launcher:iconImageSize="48"
|
|
launcher:iconTextSize="13.0"
|
|
launcher:canBeDefault="true" />
|
|
|
|
<display-option
|
|
launcher:name="Shorter Stubby"
|
|
launcher:minWidthDps="255"
|
|
launcher:minHeightDps="400"
|
|
launcher:iconImageSize="48"
|
|
launcher:iconTextSize="13.0"
|
|
launcher:canBeDefault="true" />
|
|
|
|
</grid-option>
|
|
|
|
<grid-option
|
|
launcher:name="4_by_4"
|
|
launcher:numRows="4"
|
|
launcher:numColumns="4"
|
|
launcher:numFolderRows="3"
|
|
launcher:numFolderColumns="4"
|
|
launcher:numHotseatIcons="4"
|
|
launcher:defaultLayoutId="@xml/default_workspace_4x4" >
|
|
|
|
<display-option
|
|
launcher:name="Short Stubby"
|
|
launcher:minWidthDps="275"
|
|
launcher:minHeightDps="420"
|
|
launcher:iconImageSize="48"
|
|
launcher:iconTextSize="13.0"
|
|
launcher:canBeDefault="true" />
|
|
|
|
<display-option
|
|
launcher:name="Stubby"
|
|
launcher:minWidthDps="255"
|
|
launcher:minHeightDps="450"
|
|
launcher:iconImageSize="48"
|
|
launcher:iconTextSize="13.0"
|
|
launcher:canBeDefault="true" />
|
|
|
|
<display-option
|
|
launcher:name="Nexus S"
|
|
launcher:minWidthDps="296"
|
|
launcher:minHeightDps="491.33"
|
|
launcher:iconImageSize="48"
|
|
launcher:iconTextSize="13.0"
|
|
launcher:canBeDefault="true" />
|
|
|
|
<display-option
|
|
launcher:name="Nexus 4"
|
|
launcher:minWidthDps="359"
|
|
launcher:minHeightDps="567"
|
|
launcher:iconImageSize="54"
|
|
launcher:iconTextSize="13.0"
|
|
launcher:canBeDefault="true" />
|
|
|
|
<display-option
|
|
launcher:name="Nexus 5"
|
|
launcher:minWidthDps="335"
|
|
launcher:minHeightDps="567"
|
|
launcher:iconImageSize="54"
|
|
launcher:iconTextSize="13.0"
|
|
launcher:canBeDefault="true" />
|
|
|
|
</grid-option>
|
|
|
|
<grid-option
|
|
launcher:name="5_by_5"
|
|
launcher:numRows="5"
|
|
launcher:numColumns="5"
|
|
launcher:numFolderRows="4"
|
|
launcher:numFolderColumns="4"
|
|
launcher:numHotseatIcons="5"
|
|
launcher:defaultLayoutId="@xml/default_workspace_5x5" >
|
|
|
|
<display-option
|
|
launcher:name="Large Phone"
|
|
launcher:minWidthDps="406"
|
|
launcher:minHeightDps="694"
|
|
launcher:iconImageSize="56"
|
|
launcher:iconTextSize="14.4"
|
|
launcher:canBeDefault="true" />
|
|
|
|
<display-option
|
|
launcher:name="Shorter Stubby"
|
|
launcher:minWidthDps="255"
|
|
launcher:minHeightDps="400"
|
|
launcher:iconImageSize="48"
|
|
launcher:iconTextSize="13.0"
|
|
launcher:canBeDefault="true" />
|
|
|
|
</grid-option>
|
|
|
|
</profiles> |