Merge "bliss: Move fonts to separate makefile" into q10
diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
index 813d0b7..7819e91 100755
--- a/build/tools/roomservice.py
+++ b/build/tools/roomservice.py
@@ -1,105 +1,144 @@
-#!/usr/bin/env python
-# Copyright (C) 2012-2013, The CyanogenMod Project
-# (C) 2017, The LineageOS Project
+#!/usr/bin/env python2
+
+# Copyright (C) 2013 Cybojenix <anthonydking@gmail.com>
+# Copyright (C) 2013 The OmniROM Project
+# Copyright (C) 2015 BlissRoms 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
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# 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.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
-
-import base64
import json
-import netrc
+import sys
import os
import re
-import sys
+from xml.etree import ElementTree as ES
+# Use the urllib importer from the Cyanogenmod roomservice
try:
- # For python3
- import urllib.error
- import urllib.parse
- import urllib.request
+ # For python3
+ import urllib.request
except ImportError:
- # For python2
- import imp
- import urllib2
- import urlparse
- urllib = imp.new_module('urllib')
- urllib.error = urllib2
- urllib.parse = urlparse
- urllib.request = urllib2
+ # For python2
+ import imp
+ import urllib2
+ urllib = imp.new_module('urllib')
+ urllib.request = urllib2
-from xml.etree import ElementTree
+# Config
+# set this to the default remote to use in repo
+default_rem = "github"
+# set this to the default revision to use (branch/tag name)
+default_rev = "q"
+# set this to the remote that you use for projects from your team repos
+# example fetch="https://github.com/BlissRoms-Devices"
+default_team_rem = "github"
+# this shouldn't change unless google makes changes
+local_manifest_dir = ".repo/local_manifests"
+# change this to your name on github (or equivalent hosting)
+android_team = "BlissRoms-Devices"
-product = sys.argv[1]
-if len(sys.argv) > 2:
- depsonly = sys.argv[2]
-else:
- depsonly = None
+def check_repo_exists(git_data):
+ if not int(git_data.get('total_count', 0)):
+ raise Exception("{} not found in {} Github, exiting "
+ "roomservice".format(device, android_team))
-try:
- device = product[product.index("_") + 1:]
-except:
- device = product
-if not depsonly:
- print("Device %s not found. Attempting to retrieve device repository from LineageOS Github (http://github.com/LineageOS)." % device)
-
-repositories = []
-
-try:
- authtuple = netrc.netrc().authenticators("api.github.com")
-
- if authtuple:
- auth_string = ('%s:%s' % (authtuple[0], authtuple[2])).encode()
- githubauth = base64.encodestring(auth_string).decode().replace('\n', '')
- else:
- githubauth = None
-except:
- githubauth = None
-
-def add_auth(githubreq):
- if githubauth:
- githubreq.add_header("Authorization","Basic %s" % githubauth)
-
-if not depsonly:
- githubreq = urllib.request.Request("https://api.github.com/search/repositories?q=%s+user:LineageOS+in:name+fork:true" % device)
- add_auth(githubreq)
+# Note that this can only be done 5 times per minute
+def search_github_for_device(device):
+ git_device = '+'.join(re.findall('[a-z]+|[\d]+', device))
+ git_search_url = "https://api.github.com/search/repositories" \
+ "?q=%40{}+android_device+{}+fork:true".format(android_team, git_device)
+ git_req = urllib.request.Request(git_search_url)
try:
- result = json.loads(urllib.request.urlopen(githubreq).read().decode())
- except urllib.error.URLError:
- print("Failed to search GitHub")
- sys.exit()
- except ValueError:
- print("Failed to parse return data from GitHub")
- sys.exit()
- for res in result.get('items', []):
- repositories.append(res)
+ response = urllib.request.urlopen(git_req)
+ except urllib.request.HTTPError:
+ raise Exception("There was an issue connecting to github."
+ " Please try again in a minute")
+ git_data = json.load(response)
+ check_repo_exists(git_data)
+ print("found the {} device repo".format(device))
+ return git_data
-local_manifests = r'.repo/local_manifests'
-if not os.path.exists(local_manifests): os.makedirs(local_manifests)
-def exists_in_tree(lm, path):
- for child in lm.getchildren():
- if child.attrib['path'] == path:
+def get_device_url(git_data):
+ device_url = ""
+ for item in git_data['items']:
+ temp_url = item.get('html_url')
+ if "{}/android_device".format(android_team) in temp_url:
+ try:
+ temp_url = temp_url[temp_url.index("android_device"):]
+ except ValueError:
+ pass
+ else:
+ if temp_url.endswith(device):
+ device_url = temp_url
+ break
+
+ if device_url:
+ return device_url
+ raise Exception("{} not found in {} Github, exiting "
+ "roomservice".format(device, android_team))
+
+
+def parse_device_directory(device_url,device):
+ to_strip = "android_device"
+ repo_name = device_url[device_url.index(to_strip) + len(to_strip):]
+ repo_name = repo_name[:repo_name.index(device)]
+ repo_dir = repo_name.replace("_", "/")
+ repo_dir = repo_dir + device
+ return "device{}".format(repo_dir)
+
+
+# Thank you RaYmAn
+def iterate_manifests(check_all):
+ files = []
+ if check_all:
+ for file in os.listdir(local_manifest_dir):
+ if file.endswith('.xml'):
+ files.append(os.path.join(local_manifest_dir, file))
+ files.append('.repo/manifest.xml')
+ for file in files:
+ try:
+ man = ES.parse(file)
+ man = man.getroot()
+ except IOError, ES.ParseError:
+ print("WARNING: error while parsing %s" % file)
+ else:
+ for project in man.findall("project"):
+ yield project
+
+
+def check_project_exists(url):
+ for project in iterate_manifests(True):
+ if project.get("name") == url:
return True
return False
-# in-place prettyprint formatter
+
+def check_dup_path(directory):
+ for project in iterate_manifests(False):
+ if project.get("path") == directory:
+ print ("Duplicate path %s found! Removing" % directory)
+ return project.get("name")
+ return None
+
+# Use the indent function from http://stackoverflow.com/a/4590052
def indent(elem, level=0):
- i = "\n" + level*" "
+ i = ''.join(["\n", level*" "])
if len(elem):
if not elem.text or not elem.text.strip():
- elem.text = i + " "
+ elem.text = ''.join([i, " "])
if not elem.tail or not elem.tail.strip():
elem.tail = i
for elem in elem:
@@ -110,193 +149,169 @@
if level and (not elem.tail or not elem.tail.strip()):
elem.tail = i
-def get_default_revision():
- m = ElementTree.parse(".repo/manifest.xml")
- d = m.findall('default')[0]
- r = d.get('revision')
- return r.replace('refs/heads/', '').replace('refs/tags/', '')
-def get_from_manifest(devicename):
+def create_manifest_project(url, directory,
+ remote=default_rem,
+ revision=default_rev):
+ project_exists = check_project_exists(url)
+
+ if project_exists:
+ return None
+
+ dup_path = check_dup_path(directory)
+ if not dup_path is None:
+ write_to_manifest(
+ append_to_manifest(
+ create_manifest_remove(dup_path)))
+
+ project = ES.Element("project",
+ attrib={
+ "path": directory,
+ "name": url,
+ "remote": remote,
+ "revision": revision
+ })
+ return project
+
+
+def create_manifest_remove(url):
+ remove = ES.Element("remove-project", attrib={"name": url})
+ return remove
+
+
+def append_to_manifest(project):
try:
- lm = ElementTree.parse(".repo/local_manifests/roomservice.xml")
+ lm = ES.parse('/'.join([local_manifest_dir, "roomservice.xml"]))
lm = lm.getroot()
- except:
- lm = ElementTree.Element("manifest")
+ except IOError, ES.ParseError:
+ lm = ES.Element("manifest")
+ lm.append(project)
+ return lm
- for localpath in lm.findall("project"):
- if re.search("android_device_.*_%s$" % device, localpath.get("name")):
- return localpath.get("path")
+def write_to_manifest(manifest):
+ indent(manifest)
+ raw_xml = ES.tostring(manifest).decode()
+ raw_xml = ''.join(['<?xml version="1.0" encoding="UTF-8"?>\n'
+ '<!--Please do not manually edit this file-->\n',
+ raw_xml])
+
+ with open('/'.join([local_manifest_dir, "roomservice.xml"]), 'w') as f:
+ f.write(raw_xml)
+ print("wrote the new roomservice manifest")
+
+def parse_device_from_manifest(device):
+ for project in iterate_manifests(True):
+ name = project.get('name')
+ if name.startswith("android_device_") and name.endswith(device):
+ return project.get('path')
return None
-def is_in_manifest(projectpath):
- try:
- lm = ElementTree.parse(".repo/local_manifests/roomservice.xml")
- lm = lm.getroot()
- except:
- lm = ElementTree.Element("manifest")
- for localpath in lm.findall("project"):
- if localpath.get("path") == projectpath:
- return True
-
- # Search in main manifest, too
- try:
- lm = ElementTree.parse(".repo/manifest.xml")
- lm = lm.getroot()
- except:
- lm = ElementTree.Element("manifest")
-
- for localpath in lm.findall("project"):
- if localpath.get("path") == projectpath:
- return True
-
- # ... and don't forget the lineage snippet
- try:
- lm = ElementTree.parse(".repo/manifests/snippets/lineage.xml")
- lm = lm.getroot()
- except:
- lm = ElementTree.Element("manifest")
-
- for localpath in lm.findall("project"):
- if localpath.get("path") == projectpath:
- return True
-
- return False
-
-def add_to_manifest(repositories, fallback_branch = None):
- try:
- lm = ElementTree.parse(".repo/local_manifests/roomservice.xml")
- lm = lm.getroot()
- except:
- lm = ElementTree.Element("manifest")
-
- for repository in repositories:
- repo_name = repository['repository']
- repo_target = repository['target_path']
- print('Checking if %s is fetched from %s' % (repo_target, repo_name))
- if is_in_manifest(repo_target):
- print('LineageOS/%s already fetched to %s' % (repo_name, repo_target))
- continue
-
- print('Adding dependency: LineageOS/%s -> %s' % (repo_name, repo_target))
- project = ElementTree.Element("project", attrib = { "path": repo_target,
- "remote": "github", "name": "LineageOS/%s" % repo_name })
-
- if 'branch' in repository:
- project.set('revision',repository['branch'])
- elif fallback_branch:
- print("Using fallback branch %s for %s" % (fallback_branch, repo_name))
- project.set('revision', fallback_branch)
- else:
- print("Using default branch for %s" % repo_name)
-
- lm.append(project)
-
- indent(lm, 0)
- raw_xml = ElementTree.tostring(lm).decode()
- raw_xml = '<?xml version="1.0" encoding="UTF-8"?>\n' + raw_xml
-
- f = open('.repo/local_manifests/roomservice.xml', 'w')
- f.write(raw_xml)
- f.close()
-
-def fetch_dependencies(repo_path, fallback_branch = None):
- print('Looking for dependencies in %s' % repo_path)
- dependencies_path = repo_path + '/lineage.dependencies'
- syncable_repos = []
- verify_repos = []
-
- if os.path.exists(dependencies_path):
- dependencies_file = open(dependencies_path, 'r')
- dependencies = json.loads(dependencies_file.read())
- fetch_list = []
-
- for dependency in dependencies:
- if not is_in_manifest(dependency['target_path']):
- fetch_list.append(dependency)
- syncable_repos.append(dependency['target_path'])
- verify_repos.append(dependency['target_path'])
- else:
- verify_repos.append(dependency['target_path'])
-
- dependencies_file.close()
-
- if len(fetch_list) > 0:
- print('Adding dependencies to manifest')
- add_to_manifest(fetch_list, fallback_branch)
+def parse_device_from_folder(device):
+ search = []
+ for sub_folder in os.listdir("device"):
+ if os.path.isdir("device/%s/%s" % (sub_folder, device)):
+ search.append("device/%s/%s" % (sub_folder, device))
+ if len(search) > 1:
+ print("multiple devices under the name %s. "
+ "defaulting to checking the manifest" % device)
+ location = parse_device_from_manifest(device)
+ elif len(search) == 1:
+ location = search[0]
else:
- print('%s has no additional dependencies.' % repo_path)
+ print("your device can't be found in device sources..")
+ location = parse_device_from_manifest(device)
+ return location
- if len(syncable_repos) > 0:
- print('Syncing dependencies')
- os.system('repo sync --force-sync %s' % ' '.join(syncable_repos))
- for deprepo in verify_repos:
- fetch_dependencies(deprepo)
+def parse_dependency_file(location):
+ dep_file = "bliss.dependencies"
+ dep_location = '/'.join([location, dep_file])
+ if not os.path.isfile(dep_location):
+ print("WARNING: %s file not found" % dep_location)
+ sys.exit()
+ try:
+ with open(dep_location, 'r') as f:
+ dependencies = json.loads(f.read())
+ except ValueError:
+ raise Exception("ERROR: malformed dependency file")
+ return dependencies
-def has_branch(branches, revision):
- return revision in [branch['name'] for branch in branches]
-if depsonly:
- repo_path = get_from_manifest(device)
- if repo_path:
- fetch_dependencies(repo_path)
+def create_dependency_manifest(dependencies):
+ projects = []
+ for dependency in dependencies:
+ repository = dependency.get("repository")
+ target_path = dependency.get("target_path")
+ revision = dependency.get("revision", default_rev)
+ remote = dependency.get("remote", default_rem)
+
+ # not adding an organization should default to android_team
+ # only apply this to github
+ if remote == "github":
+ if not "/" in repository:
+ repository = '/'.join([android_team, repository])
+ project = create_manifest_project(repository,
+ target_path,
+ remote=remote,
+ revision=revision)
+ if not project is None:
+ manifest = append_to_manifest(project)
+ write_to_manifest(manifest)
+ projects.append(target_path)
+ if len(projects) > 0:
+ os.system("repo sync --force-sync %s" % " ".join(projects))
+
+
+def fetch_dependencies(device):
+ location = parse_device_from_folder(device)
+ if location is None or not os.path.isdir(location):
+ raise Exception("ERROR: could not find your device "
+ "folder location, bailing out")
+ dependencies = parse_dependency_file(location)
+ create_dependency_manifest(dependencies)
+
+
+def check_device_exists(device):
+ location = parse_device_from_folder(device)
+ if location is None:
+ return False
+ return os.path.isdir(location)
+
+
+def fetch_device(device):
+ if check_device_exists(device):
+ print("WARNING: Trying to fetch a device that's already there")
+ return
+ git_data = search_github_for_device(device)
+ device_url = android_team+"/"+get_device_url(git_data)
+ device_dir = parse_device_directory(device_url,device)
+ project = create_manifest_project(device_url,
+ device_dir,
+ remote=default_team_rem)
+ if not project is None:
+ manifest = append_to_manifest(project)
+ write_to_manifest(manifest)
+ print("syncing the device config")
+ os.system('repo sync --force-sync %s' % device_dir)
+
+
+if __name__ == '__main__':
+ if not os.path.isdir(local_manifest_dir):
+ os.mkdir(local_manifest_dir)
+
+ product = sys.argv[1]
+ try:
+ device = product[product.index("_") + 1:]
+ except ValueError:
+ device = product
+
+ if len(sys.argv) > 2:
+ deps_only = sys.argv[2]
else:
- print("Trying dependencies-only mode on a non-existing device tree?")
+ deps_only = False
- sys.exit()
-
-else:
- for repository in repositories:
- repo_name = repository['name']
- if re.match(r"^android_device_[^_]*_" + device + "$", repo_name):
- print("Found repository: %s" % repository['name'])
-
- manufacturer = repo_name.replace("android_device_", "").replace("_" + device, "")
-
- default_revision = get_default_revision()
- print("Default revision: %s" % default_revision)
- print("Checking branch info")
- githubreq = urllib.request.Request(repository['branches_url'].replace('{/branch}', ''))
- add_auth(githubreq)
- result = json.loads(urllib.request.urlopen(githubreq).read().decode())
-
- ## Try tags, too, since that's what releases use
- if not has_branch(result, default_revision):
- githubreq = urllib.request.Request(repository['tags_url'].replace('{/tag}', ''))
- add_auth(githubreq)
- result.extend (json.loads(urllib.request.urlopen(githubreq).read().decode()))
-
- repo_path = "device/%s/%s" % (manufacturer, device)
- adding = {'repository':repo_name,'target_path':repo_path}
-
- fallback_branch = None
- if not has_branch(result, default_revision):
- if os.getenv('ROOMSERVICE_BRANCHES'):
- fallbacks = list(filter(bool, os.getenv('ROOMSERVICE_BRANCHES').split(' ')))
- for fallback in fallbacks:
- if has_branch(result, fallback):
- print("Using fallback branch: %s" % fallback)
- fallback_branch = fallback
- break
-
- if not fallback_branch:
- print("Default revision %s not found in %s. Bailing." % (default_revision, repo_name))
- print("Branches found:")
- for branch in [branch['name'] for branch in result]:
- print(branch)
- print("Use the ROOMSERVICE_BRANCHES environment variable to specify a list of fallback branches.")
- sys.exit()
-
- add_to_manifest([adding], fallback_branch)
-
- print("Syncing repository to retrieve project.")
- os.system('repo sync --force-sync %s' % repo_path)
- print("Repository synced!")
-
- fetch_dependencies(repo_path, fallback_branch)
- print("Done")
- sys.exit()
-
-print("Repository for %s not found in the LineageOS Github repository list. If this is in error, you may need to manually add it to your local_manifests/roomservice.xml." % device)
+ if not deps_only:
+ fetch_device(device)
+ fetch_dependencies(device)
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index 4be4046..e115ec9 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -67,6 +67,7 @@
SettingsIntelligenceGooglePrebuilt \
NexusLauncherRelease \
GalleryGoPrebuilt \
+ PixelThemes \
AboutBliss
# Accents
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index b9faa10..a5cf063 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -132,4 +132,84 @@
the corresponding recents component. When using a different default launcher, change this appropriately or use the default
systemui implementation: com.android.systemui/.recents.RecentsActivity -->
<string name="config_recentsComponentName">com.google.android.apps.nexuslauncher/com.android.quickstep.RecentsActivity</string>
+
+ <!-- Colon separated list of package names that should be granted DND access -->
+ <string name="config_defaultDndAccessPackages" translatable="false">com.google.android.gms:com.google.android.GoogleCamera:com.google.intelligence.sense:com.google.android.settings.intelligence</string>
+
+ <!-- An array of packages for which notifications cannot be blocked.
+ Should only be used for core device functionality that must not be
+ rendered inoperative for safety reasons, like the phone dialer and
+ SMS handler. -->
+ <string-array translatable="false" name="config_nonBlockableNotificationPackages">
+ <item>com.android.dialer</item>
+ <item>com.android.messaging</item>
+ <item>com.google.android.dialer</item>
+ <item>com.google.android.dialer:phone_incoming_call</item>
+ <item>com.google.android.deskclock:Firing</item>
+ <item>com.google.android.setupwizard</item>
+ <item>com.google.android.apps.pixelmigrate</item>
+ </string-array>
+
+ <!-- Colon separated list of package names that should be granted Notification Listener access -->
+ <string name="config_defaultListenerAccessPackages" translatable="false">com.google.android.apps.nexuslauncher:com.google.android.setupwizard:com.google.android.apps.pixelmigrate:com.google.android.as</string>
+
+ <!-- Package name that should be granted Notification Assistant access -->
+ <string name="config_defaultAssistantAccessPackage" translatable="false">com.google.android.ext.services</string>
+
+ <!-- The package name for the default system textclassifier service.
+ This service must be trusted, as it can be activated without explicit consent of the user.
+ Example: "com.android.textclassifier"
+ If no textclassifier service with the specified name exists on the device (or if this is
+ set to empty string), a default textclassifier will be loaded in the calling app's process.
+ See android.view.textclassifier.TextClassificationManager.
+ -->
+ <string name="config_defaultTextClassifierPackage" translatable="false">com.google.android.as</string>
+
+ <!-- The list of IMEs which should be disabled until used.
+ This function suppresses update notifications for these pre-installed apps.
+ We need to set this configuration carefully that they should not have functionarities
+ other than "IME" or "Spell Checker". In InputMethodManagerService,
+ the listed IMEs are disabled until used when all of the following conditions are met.
+ 1. Not selected as an enabled IME in the Settings
+ 2. Not selected as a spell checker in the Settings
+ 3. Installed
+ 4. A pre-installed IME
+ 5. Not enabled
+ And the disabled_until_used state for an IME is released by InputMethodManagerService
+ when the IME is selected as an enabled IME. -->
+ <string-array name="config_disabledUntilUsedPreinstalledImes" translatable="false">
+ <item>com.android.inputmethod.latin</item>
+ <item>com.google.android.inputmethod.latin</item>
+ <item>com.google.android.apps.inputmethod.hindi</item>
+ <item>com.google.android.inputmethod.japanese</item>
+ <item>com.google.android.inputmethod.korean</item>
+ <item>com.google.android.inputmethod.pinyin</item>
+ <item>jp.co.omronsoft.iwnnime.ml</item>
+ <item>com.nuance.xt9.input</item>
+ </string-array>
+
+ <!-- Additional non-platform defined secure settings exposed to Instant Apps -->
+ <string-array name="config_allowedSecureInstantAppSettings">
+ <item>advertising_id</item>
+ <item>limit_ad_tracking</item>
+ </string-array>
+
+ <!-- An array of packages that need to be treated as type service in battery settings -->
+ <string-array translatable="false" name="config_batteryPackageTypeService">
+ <item>com.google.android.gms</item>
+ <item>com.google.android.apps.gcs</item>
+ </string-array>
+
+ <!-- The package of the time zone rules data application. Expected to be configured
+ by OEMs to reference their own priv-app APK package.
+ A package-targeted com.android.intent.action.timezone.TRIGGER_RULES_UPDATE_CHECK intent
+ will be sent to the updater app if the system server detects an update to the updater or
+ data app packages.
+ [This is only used if config_enableUpdateableTimeZoneRules and
+ config_timeZoneRulesUpdateTrackingEnabled are true.] -->
+ <string name="config_timeZoneRulesDataPackage" translatable="false">com.google.android.timezone.data</string>
+
+ <!-- Flag indicating whether the assist disclosure can be disabled using
+ ASSIST_DISCLOSURE_ENABLED. -->
+ <bool name="config_allowDisablingAssistDisclosure">true</bool>
</resources>
diff --git a/overlay/common/packages/apps/ThemePicker/res/values/override.xml b/overlay/common/packages/apps/ThemePicker/res/values/override.xml
new file mode 100644
index 0000000..bf252e9
--- /dev/null
+++ b/overlay/common/packages/apps/ThemePicker/res/values/override.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Copyright (C) 2019 Havoc-OS
+
+ 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>
+
+ <string name="themes_stub_package" translatable="false">com.google.android.apps.customization.pixel</string>
+
+</resources>
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index bc38cae..187a4d2 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -72,6 +72,17 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+LOCAL_MODULE := PixelThemes
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_DEX_PREOPT := false
+LOCAL_PRODUCT_MODULE := true
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
LOCAL_MODULE := NexusLauncherRelease
LOCAL_OVERRIDES_PACKAGES := Launcher2 Launcher3 Launcher3QuickStep
LOCAL_MODULE_TAGS := optional
diff --git a/prebuilt/common/app/PixelThemes.apk b/prebuilt/common/app/PixelThemes.apk
new file mode 100644
index 0000000..be6bde3
--- /dev/null
+++ b/prebuilt/common/app/PixelThemes.apk
Binary files differ