Merge "Add tablet 5x8 grids" into main (0acfafa6) · Commits · e / os / BlissLauncher3

res/xml/backupscheme.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		<full-backup-content xmlns:android="http://schemas.android.com/apk/res/android">

		<include domain="database" path="launcher.db" />
		<include domain="database" path="launcher_5_by_8.db" />
		<include domain="database" path="launcher_6_by_5.db" />
		<include domain="database" path="launcher_5_by_6.db" />
		<include domain="database" path="launcher_4_by_6.db" />

res/xml/default_workspace_5x8.xml

0 → 100644

+76 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 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.
		-->

		<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">

		<!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
		<!-- Mail Calendar Gallery Store Internet Camera -->
		<resolve
		launcher:container="-101"
		launcher:screen="0"
		launcher:x="0"
		launcher:y="0" >
		<favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_EMAIL;end" />
		<favorite launcher:uri="mailto:" />
		</resolve>

		<resolve
		launcher:container="-101"
		launcher:screen="1"
		launcher:x="1"
		launcher:y="0" >
		<favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_CALENDAR;end" />
		</resolve>

		<resolve
		launcher:container="-101"
		launcher:screen="2"
		launcher:x="2"
		launcher:y="0" >
		<favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_GALLERY;end" />
		<favorite launcher:uri="#Intent;type=images/*;end" />
		</resolve>

		<resolve
		launcher:container="-101"
		launcher:screen="3"
		launcher:x="3"
		launcher:y="0" >
		<favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MARKET;end" />
		<favorite launcher:uri="market://details?id=com.android.launcher" />
		</resolve>

		<resolve
		launcher:container="-101"
		launcher:screen="4"
		launcher:x="4"
		launcher:y="0" >
		<favorite
		launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
		<favorite launcher:uri="http://www.example.com/" />
		</resolve>

		<!-- Resolve camera intent if GoogleCamera is not available e.g. on emulator -->
		<resolve
		launcher:container="-101"
		launcher:screen="5"
		launcher:x="5"
		launcher:y="0" >
		<favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
		<favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
		</resolve>

		</favorites>

res/xml/paddings_5x8.xml

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2024 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.
		-->

		<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto" >

		<device-padding
		launcher:maxEmptySpace="100dp">
		<workspaceTopPadding
		launcher:a="0.31"
		launcher:b="0"/>
		<workspaceBottomPadding
		launcher:a="0.69"
		launcher:b="0"/>
		<hotseatBottomPadding
		launcher:a="0"
		launcher:b="0"/>
		</device-padding>

		<device-padding
		launcher:maxEmptySpace="9999dp">
		<workspaceTopPadding
		launcher:a="0.48"
		launcher:b="0"/>
		<workspaceBottomPadding
		launcher:a="0.52"
		launcher:b="0"/>
		<hotseatBottomPadding
		launcher:a="0"
		launcher:b="0"/>
		</device-padding>
		</device-paddings>
		No newline at end of file

src/com/android/launcher3/LauncherFiles.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ public class LauncherFiles {
		private static final String XML = ".xml";

		public static final String LAUNCHER_DB = "launcher.db";
		public static final String LAUNCHER_5_BY_8_DB = "launcher_5_by_8.db";
		public static final String LAUNCHER_6_BY_5_DB = "launcher_6_by_5.db";
		public static final String LAUNCHER_4_BY_5_DB = "launcher_4_by_5.db";
		public static final String LAUNCHER_4_BY_6_DB = "launcher_4_by_6.db";
		@@ -35,6 +36,7 @@ public class LauncherFiles {

		public static final List<String> GRID_DB_FILES = Collections.unmodifiableList(Arrays.asList(
		LAUNCHER_DB,
		LAUNCHER_5_BY_8_DB,
		LAUNCHER_6_BY_5_DB,
		LAUNCHER_4_BY_5_DB,
		LAUNCHER_4_BY_6_DB,