omni: delete old dimen resources and fix properties
Change-Id: Idc4574494aa1a95cb5cb0f807c5cf5cc15ea6feb
diff --git a/config/common.mk b/config/common.mk
index 7e79d25..ee23994 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -10,10 +10,10 @@
endif
ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
ro.com.google.clientidbase=android-google
else
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
endif
@@ -21,7 +21,7 @@
PRODUCT_RESTRICT_VENDOR_FILES := false
# general properties
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
ro.com.android.wifi-watchlist=GoogleGuest \
ro.setupwizard.enterprise_mode=1 \
@@ -29,16 +29,16 @@
persist.sys.disable_rescue=true
# Google assistant
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
ro.opa.eligible_device=true
# Tethering - allow without requiring a provisioning app
# (for devices that check this)
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
net.tethering.noprovisioning=true
# Enforce privapp-permissions whitelist
-OMNI_PRODUCT_PROPERTIES += \
+#OMNI_PRODUCT_PROPERTIES += \
ro.control_privapp_permissions=enforce
PRODUCT_COPY_FILES += \
@@ -79,7 +79,7 @@
vendor/omni/prebuilt/etc/permissions/omni-power-whitelist.xml:system/etc/sysconfig/omni-power-whitelist.xml
# custom omni sounds
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
ro.config.ringtone=omni_ringtone1.ogg \
ro.config.notification_sound=omni_notification1.ogg \
ro.config.alarm_alert=omni_alarm1.ogg
@@ -104,7 +104,7 @@
vendor/omni/prebuilt/etc/mkshrc:system/etc/mkshrc
# whitelist packages for location providers not in system
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
ro.services.whitelist.packagelist=com.google.android.gms
PRODUCT_COPY_FILES += \
diff --git a/config/packages.mk b/config/packages.mk
index 2c4803f..7eb0581 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -6,9 +6,7 @@
OmniStyle \
MatLog \
OmniChange \
- OmniOverlayStub \
OmniStoreInstallerPrebuilt \
- omni-overlays \
OpenDelta \
ThemePicker \
SystemWebView \
@@ -34,6 +32,10 @@
vncpasswd \
OmniRemote
+#PRODUCT_PACKAGES += \
+ OmniOverlayStub \
+ omni-overlays
+
ifeq ($(BOARD_INCLUDE_CMDLINE_TOOLS),true)
PRODUCT_PACKAGES += \
htop \
@@ -51,8 +53,8 @@
endif
# Telephony extension
-PRODUCT_PACKAGES += telephony-ext
-PRODUCT_BOOT_JARS += telephony-ext
+#PRODUCT_PACKAGES += telephony-ext
+#PRODUCT_BOOT_JARS += telephony-ext
# for fun
#PRODUCT_PACKAGES += \
diff --git a/config/version.mk b/config/version.mk
index 731fa53..2551d84 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -25,6 +25,6 @@
endif
# Apply it to build.prop
-OMNI_PRODUCT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
ro.modversion=OmniROM-$(ROM_VERSION) \
ro.omni.version=$(ROM_VERSION)
diff --git a/overlay/common/frameworks/base/core/res/res/values/dimen.xml b/overlay/common/frameworks/base/core/res/res/values/dimen.xml
index 9cff526..3fc4d6b 100644
--- a/overlay/common/frameworks/base/core/res/res/values/dimen.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/dimen.xml
@@ -18,12 +18,6 @@
*/
-->
<resources>
- <!-- Height of area above QQS where battery/time go -->
- <!-- 48dp -->
- <dimen name="quick_qs_offset_height">40dp</dimen>
- <!-- Total height of QQS (quick_qs_offset_height + 128) -->
- <dimen name="quick_qs_total_height">168dp</dimen>
-
<!-- Corner radius of system dialogs -->
<dimen name="config_dialogCornerRadius">8.0dip</dimen> <!-- default: 2dp -->
<dimen name="config_buttonCornerRadius">4.0dip</dimen> <!-- default: 2dp -->
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values-land/dimens.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values-land/dimens.xml
index 928e9aa..daefb67 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values-land/dimens.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values-land/dimens.xml
@@ -19,15 +19,4 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- 24dp -->
- <dimen name="qs_header_tooltip_height">18dp</dimen>
-
- <!-- 48dp -->
- <dimen name="qs_tile_height_wo_label">54dp</dimen>
-
- <!-- 2dp -->
- <dimen name="qs_tile_margin_top">6dp</dimen>
-
- <dimen name="global_actions_power_dialog_item_height">98dp</dimen>
- <dimen name="global_actions_power_dialog_item_width">90dp</dimen>
</resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values-night/colors.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values-night/colors.xml
index b589050..38ccfec 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values-night/colors.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values-night/colors.xml
@@ -17,12 +17,5 @@
NOTE: You might also want to edit: core/res/res/values-night/*.xml
-->
<resources>
- <!-- The color of the background in the separated list of the Global Actions menu -->
- <color name="global_actions_separated_background">@*android:color/primary_dark_device_default_settings</color>
- <!-- The color of the background in the grid of the Global Actions menu -->
- <color name="global_actions_grid_background">@*android:color/primary_device_default_settings</color>
-
- <color name="qs_customize_background">@*android:color/primary_dark_device_default_settings</color>
- <color name="qs_customize_decoration">@*android:color/primary_device_default_settings</color>
</resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
index 2a0d225..62c2069 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
@@ -16,7 +16,6 @@
*/
-->
<resources>
- <dimen name="nav_content_padding">0dp</dimen>
- <dimen name="rounded_corner_content_padding">0dp</dimen>
+
</resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
index d18fdab..1818917 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -34,5 +34,4 @@
<!-- Whether to show activity indicators in the status bar -->
<bool name="config_showActivity">false</bool>
- <integer name="power_menu_max_columns">4</integer>
</resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 0444997..daefb67 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -19,61 +19,4 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- The height of the quick settings footer that holds the user switcher, settings icon,
- etc. -->
- <!-- 48dp -->
- <dimen name="qs_footer_height">36dp</dimen>
-
- <!-- 14dp -->
- <!-- -6 to match the reduced qs_footer_bar_height -->
- <dimen name="qs_footer_icon_padding">8dp</dimen>
-
- <!-- Margins on each side of QS Footer -->
- <dimen name="qs_footer_margin">5dp</dimen>
-
- <!-- security footer side margin -->
- <!-- 16dp -->
- <dimen name="qs_footer_padding_start">6dp</dimen>
- <dimen name="qs_footer_padding_end">0dp</dimen>
- <!-- 36 - 2*8 -->
- <dimen name="qs_footer_icon_size">20dp</dimen>
-
- <!-- End padding for left-aligned status bar clock -->
- <!-- 7dp -->
- <dimen name="status_bar_left_clock_end_padding">4dp</dimen>
-
- <!-- 8/12dp -->
- <dimen name="qs_tile_margin_top">8dp</dimen>
-
- <!-- 30dp -->
- <dimen name="qs_panel_padding_top">24dp</dimen>
-
- <!-- 106dp -->
- <dimen name="qs_tile_height">96dp</dimen>
-
- <!-- 24dp -->
- <dimen name="qs_tile_margin_vertical">16dp</dimen>
-
- <!-- 0dp -->
- <dimen name="qs_paged_tile_layout_padding_bottom">8dp</dimen>
-
- <!-- 14dp -->
- <dimen name="qs_tile_padding_top">8dp</dimen>
-
- <!-- power menu + volume dialog -->
- <!-- 8dp -->
- <!-- ALWAYS set to same as config_dialogCornerRadius -->
- <dimen name="corner_size">8dp</dimen>
- <dimen name="edge_margin">8dp</dimen>
-
- <!-- Slice header -->
- <!-- 12dp -->
- <dimen name="header_subtitle_padding">8dp</dimen>
-
- <dimen name="global_actions_power_dialog_item_height">98dp</dimen>
- <dimen name="global_actions_power_dialog_item_width">90dp</dimen>
-
- <!-- 3dp -->
- <dimen name="wide_type_icon_start_padding_qs">1dp</dimen>
- <dimen name="signal_indicator_to_icon_frame_spacing">1dp</dimen>
</resources>