Merge "Revert "overlay: add round recents"" into android-9.0
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index da5c40e..eb6fdf5 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -240,15 +240,17 @@
endif
endif
+BUILD_TOP := $(shell pwd)
+
ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
ifneq ($(TARGET_KERNEL_CLANG_VERSION),)
# Find the clang-* directory containing the specified version
- KERNEL_CLANG_VERSION := $(shell find ./prebuilts/clang/host/$(HOST_OS)-x86/ -name AndroidVersion.txt -exec grep -l $(TARGET_KERNEL_CLANG_VERSION) "{}" \; | sed -e 's|/AndroidVersion.txt$$||g;s|^.*/||g')
+ KERNEL_CLANG_VERSION := $(shell find $(BUILD_TOP)/prebuilts/clang/host/$(HOST_OS)-x86/ -name AndroidVersion.txt -exec grep -l $(TARGET_KERNEL_CLANG_VERSION) "{}" \; | sed -e 's|/AndroidVersion.txt$$||g;s|^.*/||g')
else
# Only set the latest version of clang if TARGET_KERNEL_CLANG_VERSION hasn't been set by the device config
- KERNEL_CLANG_VERSION := $(shell ls -d ./prebuilts/clang/host/$(HOST_OS)-x86/clang-* | xargs -n 1 basename | tail -1)
+ KERNEL_CLANG_VERSION := $(shell ls -d $(BUILD_TOP)/prebuilts/clang/host/$(HOST_OS)-x86/clang-* | xargs -n 1 basename | tail -1)
endif
- TARGET_KERNEL_CLANG_PATH ?= ./prebuilts/clang/host/$(HOST_OS)-x86/$(KERNEL_CLANG_VERSION)/bin
+ TARGET_KERNEL_CLANG_PATH ?= $(BUILD_TOP)/prebuilts/clang/host/$(HOST_OS)-x86/$(KERNEL_CLANG_VERSION)/bin
ifeq ($(KERNEL_ARCH),arm64)
KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=aarch64-linux-gnu-
else ifeq ($(KERNEL_ARCH),arm)
@@ -263,7 +265,7 @@
ccache := $(shell which ccache)
ifeq ($(ccache),)
- ccache := ./prebuilts/misc/$(HOST_PREBUILT_TAG)/ccache/ccache
+ ccache := $(BUILD_TOP)/prebuilts/misc/$(HOST_PREBUILT_TAG)/ccache/ccache
# Check that the executable is here.
ccache := $(strip $(wildcard $(ccache)))
endif
diff --git a/charger/images/480dpi/battery_scale.png b/charger/images/480dpi/battery_scale.png
index 86ad692..b5242fc 100644
--- a/charger/images/480dpi/battery_scale.png
+++ b/charger/images/480dpi/battery_scale.png
Binary files differ
diff --git a/charger/images/560dpi/battery_scale.png b/charger/images/560dpi/battery_scale.png
index 86ad692..479cde4 100644
--- a/charger/images/560dpi/battery_scale.png
+++ b/charger/images/560dpi/battery_scale.png
Binary files differ
diff --git a/config/common.mk b/config/common.mk
index ec4390b..c44cd5b 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -71,7 +71,8 @@
#permissions
PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/etc/permissions/privapp-permissions-omni.xml:system/etc/permissions/privapp-permissions-omni.xml \
- vendor/omni/prebuilt/etc/permissions/privapp-permissions-elgoog.xml:system/etc/permissions/privapp-permissions-elgoog.xml
+ vendor/omni/prebuilt/etc/permissions/privapp-permissions-elgoog.xml:system/etc/permissions/privapp-permissions-elgoog.xml \
+ vendor/omni/prebuilt/etc/permissions/omni-power-whitelist.xml:system/etc/permissions/omni-power-whitelist.xml
# custom omni sounds
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
diff --git a/config/packages.mk b/config/packages.mk
index 0922b59..2f50583 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -60,6 +60,7 @@
GboardOmniTheme
PRODUCT_PACKAGES += \
+ ContactsTheme \
DocumentsUITheme \
DialerTheme \
TelecommTheme \
diff --git a/google/themes/AccentBlueMonday/res/values/colors.xml b/google/themes/AccentBlueMonday/res/values/colors.xml
index f3ab59c..063af46 100644
--- a/google/themes/AccentBlueMonday/res/values/colors.xml
+++ b/google/themes/AccentBlueMonday/res/values/colors.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="omni_color3">#ff78b8ff</color> <!-- ACCENT LIGHT -->
- <color name="omni_color4">#ff5fabff</color> <!-- ACCENT DARK -->
- <color name="omni_color5">#ffabd3ff</color> <!-- ACCENT -->
+ <color name="omni_color3">#ff19a7db</color> <!-- ACCENT LIGHT -->
+ <color name="omni_color4">#ff008ec2</color> <!-- ACCENT DARK -->
+ <color name="omni_color5">#ff009ed8</color> <!-- ACCENT -->
<!-- accents -->
<color name="accent_device_default_light">@*android:color/omni_color3</color>
diff --git a/google/themes/AccentGoldenShower/res/values/colors.xml b/google/themes/AccentGoldenShower/res/values/colors.xml
index 3b6c29f..aa36ab5 100644
--- a/google/themes/AccentGoldenShower/res/values/colors.xml
+++ b/google/themes/AccentGoldenShower/res/values/colors.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="omni_color3">#ffFFFF00</color> <!-- ACCENT LIGHT -->
- <color name="omni_color4">#ffFFEA00</color> <!-- ACCENT DARK -->
- <color name="omni_color5">#ffFFFF00</color> <!-- ACCENT -->
+ <color name="omni_color3">#fff1bc23</color> <!-- ACCENT LIGHT -->
+ <color name="omni_color4">#ffd8a209</color> <!-- ACCENT DARK -->
+ <color name="omni_color5">#fff0b50b</color> <!-- ACCENT -->
<!-- accents -->
<color name="accent_device_default_light">@*android:color/omni_color3</color>
diff --git a/google/themes/AccentPixel/res/values/colors.xml b/google/themes/AccentPixel/res/values/colors.xml
index 91e0ee9..56433a8 100644
--- a/google/themes/AccentPixel/res/values/colors.xml
+++ b/google/themes/AccentPixel/res/values/colors.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="omni_color3">#ff4285f4</color> <!-- ACCENT LIGHT -->
- <color name="omni_color4">#ff3367d6</color> <!-- ACCENT DARK -->
- <color name="omni_color5">#ff5e97f6</color> <!-- ACCENT -->
+ <color name="omni_color4">#ff5e97f6</color> <!-- ACCENT DARK -->
+ <color name="omni_color5">#ff3367d6</color> <!-- ACCENT -->
<!-- accents -->
<color name="accent_device_default_light">@*android:color/omni_color3</color>
diff --git a/google/themes/AccentSluttyPink/res/values/colors.xml b/google/themes/AccentSluttyPink/res/values/colors.xml
index 0d659b3..660dccb 100644
--- a/google/themes/AccentSluttyPink/res/values/colors.xml
+++ b/google/themes/AccentSluttyPink/res/values/colors.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="omni_color3">#ffff205a</color> <!-- ACCENT LIGHT -->
- <color name="omni_color4">#ffff206e</color> <!-- ACCENT DARK -->
+ <color name="omni_color3">#ffff196a</color> <!-- ACCENT LIGHT -->
+ <color name="omni_color4">#ffe50051</color> <!-- ACCENT DARK -->
<color name="omni_color5">#ffff005a</color> <!-- ACCENT -->
<!-- accents -->
diff --git a/google/themes/AccentTeal/res/values/colors.xml b/google/themes/AccentTeal/res/values/colors.xml
index afc0c89..9a48517 100644
--- a/google/themes/AccentTeal/res/values/colors.xml
+++ b/google/themes/AccentTeal/res/values/colors.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="omni_color3">#ff009688</color> <!-- ACCENT LIGHT -->
- <color name="omni_color4">#ff009688</color> <!-- ACCENT DARK -->
+ <color name="omni_color3">#ff19a093</color> <!-- ACCENT LIGHT -->
+ <color name="omni_color4">#ff00877a</color> <!-- ACCENT DARK -->
<color name="omni_color5">#ff009688</color> <!-- ACCENT -->
<!-- accents -->
diff --git a/google/themes/AccentWhite/res/values/colors.xml b/google/themes/AccentWhite/res/values/colors.xml
index 239aea7..475b922 100644
--- a/google/themes/AccentWhite/res/values/colors.xml
+++ b/google/themes/AccentWhite/res/values/colors.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="omni_color3">#fff9f9f9</color> <!-- ACCENT LIGHT -->
- <color name="omni_color4">#ffe0e0e0</color> <!-- ACCENT DARK -->
- <color name="omni_color5">#fffefefe</color> <!-- ACCENT -->
+ <color name="omni_color3">#ffc0c1c0</color> <!-- ACCENT LIGHT -->
+ <color name="omni_color4">#ffa7a8a7</color> <!-- ACCENT DARK -->
+ <color name="omni_color5">#FFBABBBA</color> <!-- ACCENT -->
<!-- accents -->
<color name="accent_device_default_light">@*android:color/omni_color3</color>
diff --git a/google/themes/ContactsTheme/Android.mk b/google/themes/ContactsTheme/Android.mk
new file mode 100644
index 0000000..43abb94
--- /dev/null
+++ b/google/themes/ContactsTheme/Android.mk
@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := ContactsTheme
+LOCAL_RRO_THEME := ContactsTheme
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/google/themes/ContactsTheme/AndroidManifest.xml b/google/themes/ContactsTheme/AndroidManifest.xml
new file mode 100644
index 0000000..7652357
--- /dev/null
+++ b/google/themes/ContactsTheme/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="org.omnirom.theme.app.contactstheme"
+ platformBuildVersionCode="28"
+ platformBuildVersionName="9.0.0">
+
+ <overlay android:priority="100" android:targetPackage="com.android.contacts" />
+
+
+ <application android:hasCode="false"
+ android:label="Contacts Theme" />
+</manifest>
diff --git a/google/themes/ContactsTheme/res/drawable/dialog_background_material.xml b/google/themes/ContactsTheme/res/drawable/dialog_background_material.xml
new file mode 100644
index 0000000..6a81eb4
--- /dev/null
+++ b/google/themes/ContactsTheme/res/drawable/dialog_background_material.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+ android:inset="16dp">
+ <shape android:shape="rectangle">
+ <corners android:radius="16dp" />
+ <solid android:color="@*android:color/omni_color7" />
+ </shape>
+</inset>
+
diff --git a/google/themes/ContactsTheme/res/drawable/item_background_material_dark.xml b/google/themes/ContactsTheme/res/drawable/item_background_material_dark.xml
new file mode 100644
index 0000000..736d2b5
--- /dev/null
+++ b/google/themes/ContactsTheme/res/drawable/item_background_material_dark.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<!-- Based on the Theme.Material's default selectableItemBackground -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@*android:color/omni_color3" >
+ <item android:id="@android:id/mask">
+ <color android:color="@*android:color/omni_color2" />
+ </item>
+</ripple>
+
diff --git a/google/themes/ContactsTheme/res/values/colors.xml b/google/themes/ContactsTheme/res/values/colors.xml
new file mode 100644
index 0000000..b411c91
--- /dev/null
+++ b/google/themes/ContactsTheme/res/values/colors.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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>
+ <color name="ic_add_contact_shortcut_background">@*android:color/omni_color2</color>
+
+ <!-- 87% black -->
+ <color name="quantum_black_text">@*android:color/omni_text_primary</color>
+
+ <!-- 54% black -->
+ <color name="quantum_black_secondary_text">@*android:color/omni_text_secondary</color>
+
+ <!-- 38% black -->
+ <color name="quantum_black_hint_text">@*android:color/omni_text_tertiary</color>
+
+ <color name="quickcontact_entry_sub_header_text_color">@*android:color/omni_text2</color>
+ <color name="quickcontact_entry_header_text_color">@*android:color/omni_text1</color>
+
+ <color name="action_bar_background">@*android:color/omni_color5</color>
+
+ <color name="actionbar_background_color">@*android:color/omni_color5</color>
+
+ <color name="contextual_selection_bar_color">@*android:color/omni_color5</color>
+ <!-- Color of the status bar above the contextual selection bar. -->
+ <color name="contextual_selection_bar_status_bar_color">@*android:color/omni_color4</color>
+
+ <color name="primary_color_dark">@*android:color/omni_color4</color>
+ <color name="primary_color">@*android:color/omni_color5</color>
+
+ <color name="group_primary_color_dark">@*android:color/omni_color4</color>
+ <color name="group_primary_color">@*android:color/omni_color5</color>
+
+ <!-- Color of the selected tab underline -->
+ <color name="contacts_accent_color">@*android:color/omni_color2</color>
+
+ <color name="floating_action_button_icon_color">@*android:color/omni_color2</color>
+
+ <!-- Horizontal separator line should be 12% dark in the light theme. -->
+ <color name="divider_line_color_light">#80808080</color>
+
+ <!-- Color of the text on an ExpandingEntryCard button -->
+ <color name="expanding_entry_card_button_text_color">@*android:color/omni_text1</color>
+
+ <!-- Background color for an ExpandingEntryCard (LAST) -->
+ <color name="expanding_entry_card_background_color">@*android:color/omni_color2</color>
+
+ <!-- Color of the margin for cards -->
+ <color name="card_margin_color">@*android:color/omni_color1</color>
+
+ <!-- Background color of pinned header items. -->
+ <color name="list_item_pinned_header_color">@*android:color/omni_color1</color>
+
+ <!-- Color of disabled text and unfocused hint text inside the contact editor. 25% black. -->
+ <color name="editor_disabled_text_color">@*android:color/omni_text3</color>
+
+ <!-- Color of text of people names in contact list when item is disabled. 30% black -->
+ <color name="disabled_contact_list_name_text">@*android:color/omni_text3</color>
+
+ <!-- Color of background of all empty states. -->
+ <color name="empty_state_background">@*android:color/omni_color1</color>
+
+ <!-- Colors of swipeRefreshLayout's spinning circle. -->
+ <color name="swipe_refresh_color1">@*android:color/omni_color5</color>
+ <color name="swipe_refresh_color2">@*android:color/omni_color2</color>
+ <color name="swipe_refresh_color3">@*android:color/omni_color3</color>
+ <color name="swipe_refresh_color4">#777777</color>
+
+ <!-- Divider color for header separator -->
+ <color name="primary_text_color">@*android:color/omni_text1</color>
+
+ <color name="secondary_text_color">@*android:color/omni_text2</color>
+
+ <!-- Color of the theme of the People app -->
+ <color name="people_app_theme_color">@*android:color/omni_color5</color>
+
+ <!-- Color of the theme of the Dialer app -->
+ <color name="dialtacts_theme_color">@*android:color/omni_color5</color>
+
+ <!-- Text color for section header. -->
+ <color name="section_header_text_color">@*android:color/omni_text1</color>
+
+ <!-- Color of image view placeholder. -->
+ <color name="image_placeholder">#222222</color>
+
+ <!-- Primary text color in the Phone app -->
+ <color name="dialtacts_primary_text_color">@*android:color/omni_text1</color>
+
+ <!-- Secondary text color in the Phone app -->
+ <color name="dialtacts_secondary_text_color">@*android:color/omni_text2</color>
+
+ <color name="shortcut_overlay_text_background">#7f000000</color>
+
+ <color name="textColorIconOverlay">#fff</color>
+ <color name="textColorIconOverlayShadow">#000</color>
+
+ <!-- Background colors for LetterTileDrawables. This set of colors is a subset of
+ https://spec.googleplex.com/quantumpalette#extended which passes Google Accessibility
+ Requirements for the color in question on white with >= 3.0 contrast. We used
+ http://leaverou.github.io/contrast-ratio/#white-on-%23db4437 to double-check the contrast.
+
+ These colors are also used by MaterialColorMapUtils to generate primary activity colors.
+ -->
+ <array name="letter_tile_colors">
+ <item>#8c2b23</item>
+ <item>#af164a</item>
+ <item>#51d847</item>
+ <item>#4e2b8c</item>
+ <item>#2e3b84</item>
+ <item>#2d5dad</item>
+ <item>#0071a8</item>
+ <item>#0f5d66</item>
+ <item>#02665c</item>
+ <item>#0b7743</item>
+ <item>#507a2c</item>
+ <item>#af4f00</item>
+ <item>#cc451a</item>
+ <item>#595959</item>
+ </array>
+
+ <!-- Darker versions of letter_tile_colors, two shades darker. These colors are used
+ for settings secondary activity colors. -->
+ <array name="letter_tile_colors_dark">
+ <item>#8c2b23</item>
+ <item>#af164a</item>
+ <item>#51d847</item>
+ <item>#4e2b8c</item>
+ <item>#2e3b84</item>
+ <item>#2d5dad</item>
+ <item>#0071a8</item>
+ <item>#0f5d66</item>
+ <item>#02665c</item>
+ <item>#0b7743</item>
+ <item>#507a2c</item>
+ <item>#af4f00</item>
+ <item>#cc451a</item>
+ <item>#595959</item>
+ </array>
+
+ <!-- The default color used for tinting photos when no color can be extracted via Palette,
+ this is Blue Grey 500 -->
+ <color name="quickcontact_default_photo_tint_color">@*android:color/omni_color4</color>
+ <!-- The default secondary color when no color can be extracted via Palette,
+ this is Blue Grey 700 -->
+ <color name="quickcontact_default_photo_tint_color_dark">@*android:color/omni_color2</color>
+
+ <!-- Color of the title to the Frequently Contacted section -->
+ <color name="frequently_contacted_title_color">@*android:color/omni_color5</color>
+
+ <!-- Text color of the search box text as entered by user -->
+ <color name="searchbox_text_color">@*android:color/omni_text_primary</color>
+ <!-- Background color of the search box -->
+ <color name="searchbox_background_color">@*android:color/omni_color2</color>
+
+ <color name="searchbox_hint_text_color">@*android:color/omni_text_secondary</color>
+
+ <color name="search_shortcut_icon_color">@*android:color/omni_color7</color>
+
+ <!-- Color of the background of the contact detail and editor pages -->
+ <color name="background_primary">@*android:color/omni_color1</color>
+ <color name="contact_all_list_background_color">@*android:color/omni_color2</color>
+
+ <!-- Text color used for character counter when the max limit has been exceeded -->
+ <color name="call_subject_limit_exceeded">#d1041c</color>
+
+ <!-- Tint color for the call subject history icon. -->
+ <color name="call_subject_history_icon">#ffffff</color>
+
+ <!-- Text color for the SEND & CALL button on the call subject dialog. -->
+ <color name="call_subject_button">#00c853</color>
+
+ <!-- Background color for the call subject history view. -->
+ <color name="call_subject_history_background">@*android:color/omni_color1</color>
+ <color name="search_video_call_icon_tint">@*android:color/omni_text3</color>
+
+ <!-- Text color for an action in a snackbar. -->
+ <color name="snackbar_action_text">@*android:color/omni_text1</color>
+ <!-- Background color for a snackbar. -->
+ <color name="snackbar_background">@*android:color/omni_color1</color>
+
+ <!-- Color of account/custom filters -->
+ <color name="account_filter_text_color">@*android:color/omni_text1</color>
+ <color name="custom_filter_divider">#0b0b0b</color>
+
+ <color name="material_star_pink">@*android:color/omni_color5</color>
+
+ <!-- Primary text color in Contacts app -->
+ <color name="contacts_text_color">@*android:color/omni_text1</color>
+
+ <!-- tint color for device account icons -->
+ <color name="device_account_tint_color">#7f7f7f</color>
+
+ <!-- Background color for sync-off alert. -->
+ <color name="alert_background">@*android:color/omni_color7</color>
+
+ <!-- Divider color in navigation drawer -->
+ <color name="drawer_divider_color">@*android:color/omni_color2</color>
+
+ <!-- Background color for the navigation drawer -->
+ <color name="navigation_drawer_background_color">@*android:color/omni_color2</color>
+
+ <!-- Background color for the current selected item in the navigation drawer -->
+ <color name="drawer_selected_color">@*android:color/omni_color1</color>
+
+ <!-- Highlight color used in places such as ripples -->
+ <color name="control_highlight_color">#1Affffff</color>
+
+ <color name="ic_contacts_launcher_background">#2458CA</color>
+
+ <!-- Color of ripples used for views with dark backgrounds -->
+ <color name="ripple_material_dark">@*android:color/omni_color3</color>
+
+</resources>
diff --git a/google/themes/ContactsTheme/res/values/styles.xml b/google/themes/ContactsTheme/res/values/styles.xml
new file mode 100644
index 0000000..3df015e
--- /dev/null
+++ b/google/themes/ContactsTheme/res/values/styles.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <style name="NonPhoneDialogTheme" parent="@*android:Theme.DeviceDefault.Dialog">
+ <!-- Color palette -->
+ <item name="android:colorPrimary">@*android:color/omni_color2</item>
+ <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+ <item name="android:colorSecondary">@*android:color/omni_color1</item>
+ <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+ <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+ <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+ <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+ <item name="android:textColorHint">@*android:color/omni_color3</item>
+ <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+ <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+ <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+ <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
+ </style>
+
+ <style name="ConfirmAddDetailDialogTheme" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.MinWidth">
+ <item name="android:windowCloseOnTouchOutside">true</item>
+ <!-- Color palette -->
+ <item name="android:colorPrimary">@*android:color/omni_color2</item>
+ <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+ <item name="android:colorSecondary">@*android:color/omni_color1</item>
+ <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+ <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+ <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+ <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+ <item name="android:textColorHint">@*android:color/omni_color3</item>
+ <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+ <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+ <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+ <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
+ </style>
+
+ <style name="ContactEditorAccountsChangedActivityTheme" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth">
+ <item name="android:windowCloseOnTouchOutside">true</item>
+
+ <!-- Color palette -->
+ <item name="android:colorPrimary">@*android:color/omni_color2</item>
+ <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+ <item name="android:colorSecondary">@*android:color/omni_color1</item>
+ <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+ <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+ <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+ <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+ <item name="android:textColorHint">@*android:color/omni_color3</item>
+ <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+ <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+ <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+ <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
+ </style>
+
+ <style name="Theme.CallSubjectDialogTheme" parent="@*android:style/Theme.DeviceDefault.Dialog">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">match_parent</item>
+
+ <!-- No backgrounds, titles or window float -->
+ <item name="android:windowIsTranslucent">true</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowFullscreen">false</item>
+ <item name="android:windowIsFloating">true</item>
+ <item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowElevation">0dp</item>
+
+ <!-- Color palette -->
+ <item name="android:colorPrimary">@*android:color/omni_color2</item>
+ <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+ <item name="android:colorSecondary">@*android:color/omni_color1</item>
+ <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+ <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+ <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+ <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+ <item name="android:textColorHint">@*android:color/omni_color3</item>
+ <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+ <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+ <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+ <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
+
+ </style>
+
+ <style name="ContactsAlertDialogTheme" parent="@*android:style/Theme.DeviceDefault.Dialog">
+ <!-- Color palette -->
+ <item name="android:colorPrimary">@*android:color/omni_color2</item>
+ <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
+ <item name="android:colorSecondary">@*android:color/omni_color1</item>
+ <item name="android:colorAccent">@*android:color/omni_color5</item>
+
+ <item name="android:textColorPrimary">@*android:color/omni_text_primary</item>
+ <item name="android:textColorSecondary">@*android:color/omni_text_secondary</item>
+ <item name="android:textColorTertiary">@*android:color/omni_text_tertiary</item>
+ <item name="android:textColorHint">@*android:color/omni_color3</item>
+ <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
+ <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+ <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+ <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
+ </style>
+
+
+</resources>
diff --git a/google/themes/DialerTheme/AndroidManifest.xml b/google/themes/DialerTheme/AndroidManifest.xml
index 0b46971..490a152 100644
--- a/google/themes/DialerTheme/AndroidManifest.xml
+++ b/google/themes/DialerTheme/AndroidManifest.xml
@@ -4,7 +4,7 @@
platformBuildVersionCode="28"
platformBuildVersionName="9.0.0">
- <overlay android:priority="2" android:targetPackage="com.android.dialer" />
+ <overlay android:priority="10" android:targetPackage="com.android.dialer" />
<application android:hasCode="false"
diff --git a/google/themes/DialerTheme/java/com/android/contacts/common/res/values/colors.xml b/google/themes/DialerTheme/java/com/android/contacts/common/res/values/colors.xml
index eff136c..7917d94 100644
--- a/google/themes/DialerTheme/java/com/android/contacts/common/res/values/colors.xml
+++ b/google/themes/DialerTheme/java/com/android/contacts/common/res/values/colors.xml
@@ -51,6 +51,8 @@
<item>#424242</item>
</array>
+ <color name="contactscommon_actionbar_background_color">@*android:color/omni_color5</color>
+
<color name="tab_ripple_color">#ffffff</color>
<color name="tab_selected_underline_color">#ffffff</color>
<color name="tab_unread_count_background_color">@*android:color/omni_color2</color>
diff --git a/google/themes/DialerTheme/java/com/android/dialer/app/res/values/color.xml b/google/themes/DialerTheme/java/com/android/dialer/app/res/values/color.xml
index 6b7b758..41ab928 100644
--- a/google/themes/DialerTheme/java/com/android/dialer/app/res/values/color.xml
+++ b/google/themes/DialerTheme/java/com/android/dialer/app/res/values/color.xml
@@ -19,37 +19,27 @@
<color name="setting_background_color">@*android:color/omni_color1</color>
<!-- 54% black -->
- <color name="call_log_icon_tint">#8affffff</color>
+ <color name="call_log_icon_tint">@*android:color/omni_text2</color>
<!-- 87% black -->
- <color name="call_log_primary_color">#deffffff</color>
+ <color name="call_log_primary_color">@*android:color/omni_text1</color>
<!-- 54% black -->
- <color name="call_log_detail_color">#8affffff</color>
+ <color name="call_log_detail_color">@*android:color/omni_text2</color>
<!-- 87% black -->
- <color name="call_log_voicemail_transcript_color">#deffffff</color>
+ <color name="call_log_voicemail_transcript_color">@*android:color/omni_text1</color>
<!-- 54% black -->
- <color name="call_log_voicemail_transcript_branding_color">#8affffff</color>
- <!-- 100% blue -->
- <color name="call_log_voicemail_transcript_rating_color">#ff2a56c6</color>
+ <color name="call_log_voicemail_transcript_branding_color">@*android:color/omni_text2</color>
<!-- 70% black -->
- <color name="call_log_action_color">#b3ffffff</color>
+ <color name="call_log_action_color">@*android:color/omni_text1</color>
<!-- 54% black -->
- <color name="call_log_day_group_heading_color">#8affffff</color>
+ <color name="call_log_day_group_heading_color">@*android:color/omni_text2</color>
<!-- 87% black-->
- <color name="call_log_unread_text_color">#deffffff</color>
+ <color name="call_log_unread_text_color">@*android:color/omni_text1</color>
- <color name="voicemail_icon_disabled_tint">#80ffffff</color>
+ <color name="voicemail_icon_disabled_tint">@*android:color/omni_text2</color>
<!-- Background color for search results and call details -->
<color name="background_dialer_results">@*android:color/omni_color1</color>
- <!-- Color of the contact name in favorite tiles -->
- <color name="contact_tile_name_color">#ffffff</color>
-
- <color name="remove_text_color">#ffffff</color>
-
- <!-- Text color for the "Remove" text when a contact is dragged on top of the remove view -->
- <color name="remove_highlighted_text_color">#FF3F3B</color>
-
<color name="call_log_action_divider">@*android:color/omni_color7</color>
<color name="divider_line_color">#D8D8D8</color>
diff --git a/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/colors.xml b/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/colors.xml
index 6420dbb..41f3ba4 100644
--- a/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/colors.xml
+++ b/google/themes/DialerTheme/java/com/android/dialer/theme/res/values/colors.xml
@@ -15,11 +15,11 @@
-->
<resources>
- <color name="dialer_theme_color">@*android:color/omni_color4</color>
- <color name="dialer_theme_color_dark">@*android:color/omni_color1</color>
+ <color name="dialer_theme_color">@*android:color/omni_color5</color>
+ <color name="dialer_theme_color_dark">@*android:color/omni_color4</color>
<color name="dialer_snackbar_action_text_color">@*android:color/omni_color8</color>
- <color name="dialer_theme_color_20pct">@*android:color/omni_color3</color>
+ <color name="dialer_theme_color_20pct">@*android:color/omni_color4</color>
<!-- <color name="dialpad_fab_green">@*android:color/omni_color5</color> -->
@@ -36,7 +36,7 @@
<color name="dialer_secondary_text_color_hiden">@*android:color/omni_text3</color>
<!-- Color of the theme of the Dialer app -->
- <color name="dialtacts_theme_color">@*android:color/omni_color2</color>
+ <color name="dialtacts_theme_color">@*android:color/omni_color5</color>
<!-- Background color of new dialer activity -->
<color name="background_dialer_light">@*android:color/omni_color1</color>
@@ -50,7 +50,7 @@
<color name="notification_action_answer_video">#097138</color>
<!-- Background color of action bars -->
- <color name="actionbar_background_color">@*android:color/omni_color2</color>
+ <color name="actionbar_background_color">@*android:color/omni_color5</color>
<!-- Background color of title bars in recents -->
<color name="titlebar_in_recents_background_color">@*android:color/omni_color4</color>
diff --git a/google/themes/DocumentsUITheme/res/values/colors.xml b/google/themes/DocumentsUITheme/res/values/colors.xml
index d496615..a03e687 100644
--- a/google/themes/DocumentsUITheme/res/values/colors.xml
+++ b/google/themes/DocumentsUITheme/res/values/colors.xml
@@ -21,8 +21,8 @@
<color name="directory_background">@*android:color/omni_color1</color>
<color name="menu_search_background">@android:color/transparent</color>
- <color name="primary_dark">@*android:color/omni_color1</color>
- <color name="primary">@*android:color/omni_color2</color>
+ <color name="primary_dark">@*android:color/omni_color4</color>
+ <color name="primary">@*android:color/omni_color5</color>
<color name="accent">@*android:color/omni_color5</color>
<color name="accent_dark">@*android:color/omni_color4</color>
diff --git a/google/themes/PrimaryDarkBlue/res/drawable/list_divider_material.xml b/google/themes/PrimaryDarkBlue/res/drawable/list_divider_material.xml
new file mode 100644
index 0000000..051f1c5
--- /dev/null
+++ b/google/themes/PrimaryDarkBlue/res/drawable/list_divider_material.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="@*android:color/omni_color7">
+ <solid android:color="#1f000000" />
+ <size
+ android:height="1dp"
+ android:width="1dp" />
+</shape>
+
diff --git a/google/themes/TelecommTheme/res/values/colors.xml b/google/themes/TelecommTheme/res/values/colors.xml
index 9b729b3..1b622c9 100644
--- a/google/themes/TelecommTheme/res/values/colors.xml
+++ b/google/themes/TelecommTheme/res/values/colors.xml
@@ -15,18 +15,8 @@
-->
<resources>
- <color name="theme_color">@*android:color/omni_color4</color>
- <color name="dialer_settings_actionbar_text_color">#ffffff</color>
- <color name="dialer_settings_actionbar_background_color">@*android:color/omni_color1</color>
- <color name="dialer_settings_color_dark">@*android:color/omni_color2</color>
-
- <color name="blocked_numbers_divider_color">#e5e5e5</color>
- <color name="blocked_numbers_butter_bar_color">#f5f5f5</color>
- <color name="blocked_numbers_title_text_color">#baffffff</color>
- <color name="blocked_numbers_secondary_text_color">#89ffffff</color>
-
- <color name="notification_action_answer">#097138</color>
- <color name="notification_action_decline">#A52714</color>
+ <color name="theme_color">@*android:color/omni_color5</color>
+ <color name="dialer_settings_color_dark">@*android:color/omni_color4</color>
</resources>
diff --git a/google/themes/TelecommTheme/res/values/styles.xml b/google/themes/TelecommTheme/res/values/styles.xml
index b408e54..3f47264 100644
--- a/google/themes/TelecommTheme/res/values/styles.xml
+++ b/google/themes/TelecommTheme/res/values/styles.xml
@@ -15,13 +15,5 @@
-->
<resources>
- <style name="Theme.Telecomm.Transparent" parent="@*android:style/Theme.Material">
- </style>
-
- <style name="Theme.Telecom.DialerSettings" parent="@*android:style/Theme.Material">
- </style>
-
- <style name="Theme.Telecom.BlockedNumbers" parent="@*android:style/Theme.Material">
- </style>
</resources>
diff --git a/overlay/CarrierConfig/packages/apps/CarrierConfig/res/xml/vendor.xml b/overlay/CarrierConfig/packages/apps/CarrierConfig/res/xml/vendor.xml
index 20755d2..45787a3 100644
--- a/overlay/CarrierConfig/packages/apps/CarrierConfig/res/xml/vendor.xml
+++ b/overlay/CarrierConfig/packages/apps/CarrierConfig/res/xml/vendor.xml
@@ -1404,6 +1404,11 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
</carrier_config>
+ <carrier_config mcc="262" mnc="07" >
+ <boolean name="carrier_volte_available_bool" value="true" />
+ <boolean name="carrier_wfc_ims_available_bool" value="true" />
+ <boolean name="carrier_vt_available_bool" value="true" />
+ </carrier_config>
<carrier_config mcc="262" mnc="02" />
<carrier_config mcc="268" mnc="01" >
<boolean name="carrier_volte_available_bool" value="true" />
diff --git a/prebuilt/app/Fun/EggGame.apk b/prebuilt/app/Fun/EggGame.apk
index 50e4538..cc2b4c8 100644
--- a/prebuilt/app/Fun/EggGame.apk
+++ b/prebuilt/app/Fun/EggGame.apk
Binary files differ
diff --git a/prebuilt/etc/permissions/omni-power-whitelist.xml b/prebuilt/etc/permissions/omni-power-whitelist.xml
new file mode 100644
index 0000000..9d16de0
--- /dev/null
+++ b/prebuilt/etc/permissions/omni-power-whitelist.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+ <allow-in-power-save package="org.omnirom.deskclock" />
+ <allow-in-power-save package="com.android.deskclock" />
+</config>
diff --git a/prebuilt/etc/permissions/privapp-permissions-elgoog.xml b/prebuilt/etc/permissions/privapp-permissions-elgoog.xml
index 599ef72..ec036fd 100644
--- a/prebuilt/etc/permissions/privapp-permissions-elgoog.xml
+++ b/prebuilt/etc/permissions/privapp-permissions-elgoog.xml
@@ -84,6 +84,7 @@
<permission name="android.permission.SEND_SMS_NO_CONFIRMATION"/>
<permission name="android.permission.SET_PREFERRED_APPLICATIONS"/>
<permission name="android.permission.STATUS_BAR"/>
+ <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
<permission name="android.permission.UPDATE_DEVICE_STATS"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
</privapp-permissions>
diff --git a/sepolicy/private/file.te b/sepolicy/private/file.te
new file mode 100644
index 0000000..d01594e
--- /dev/null
+++ b/sepolicy/private/file.te
@@ -0,0 +1,2 @@
+type sysfs_block_scheduler, fs_type, sysfs_type;
+
diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
index 40295bb..b62ada7 100644
--- a/sepolicy/private/file_contexts
+++ b/sepolicy/private/file_contexts
@@ -2,3 +2,6 @@
/system/bin/backuptool_ab\.functions u:object_r:otapreopt_chroot_exec:s0
/system/bin/backuptool_ab\.sh u:object_r:otapreopt_chroot_exec:s0
/system/bin/backuptool_postinstall\.sh u:object_r:otapreopt_chroot_exec:s0
+
+# Set disk scheduler via init
+/sys/block/[^/]+/queue/scheduler u:object_r:sysfs_block_scheduler:s0
diff --git a/sepolicy/private/init.te b/sepolicy/private/init.te
new file mode 100644
index 0000000..3491baf
--- /dev/null
+++ b/sepolicy/private/init.te
@@ -0,0 +1,7 @@
+# Set disk scheduler in init.local.rc
+allow init sysfs_block_scheduler:file { open setattr write };
+
+# Mount debugfs in init.local.rc
+userdebug_or_eng(`
+ allow init debugfs:dir mounton;
+')
