diff --git a/.gitignore b/.gitignore index 1062418c4b5..69f9593e08e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea/ *.iml +ColtEnigma/* diff --git a/Android.bp b/Android.bp index bb9db22e8da..15620a96d4a 100644 --- a/Android.bp +++ b/Android.bp @@ -44,7 +44,15 @@ android_library { "SettingsLib-search-defaults", ], - srcs: ["src/**/*.java"], + srcs: ["src/**/*.java", + "ColtEnigma/src/**/*.java", + ], + + aaptflags: ["--extra-packages com.colt.settings"], + + resource_dirs: ["res", + "ColtEnigma/res" + ], static_libs: [ "androidx-constraintlayout_constraintlayout", @@ -80,6 +88,10 @@ android_library { "ims-common", "app-compat-annotations", ], + + optimize: { + proguard_flags_files: ["proguard.flags"], + }, } platform_compat_config { diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9b2cf2412a2..14f346f39bf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -50,6 +50,7 @@ + @@ -140,8 +141,7 @@ + android:exported="true"> @@ -414,7 +414,6 @@ @@ -1287,6 +1286,27 @@ android:value="true" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ColtEnigma b/ColtEnigma new file mode 120000 index 00000000000..df37eac2c02 --- /dev/null +++ b/ColtEnigma @@ -0,0 +1 @@ +../ColtEnigma \ No newline at end of file diff --git a/proguard.flags b/proguard.flags index b66a7862df2..d038f1e4cec 100644 --- a/proguard.flags +++ b/proguard.flags @@ -17,6 +17,8 @@ *; } +-keep class com.colt.enigma.** + # We want to keep methods in Activity that could be used in the XML attribute onClick. -keepclassmembers class * extends android.app.Activity { public void *(android.view.View); diff --git a/res/drawable-nodpi/fingerprint_sensor_location_front_overlay.png b/res/drawable-nodpi/fingerprint_sensor_location_front_overlay.png new file mode 100644 index 00000000000..f1e5bde0edd Binary files /dev/null and b/res/drawable-nodpi/fingerprint_sensor_location_front_overlay.png differ diff --git a/res/drawable-nodpi/swipe_to_screenshot.png b/res/drawable-nodpi/swipe_to_screenshot.png new file mode 100644 index 00000000000..853c09e7afc Binary files /dev/null and b/res/drawable-nodpi/swipe_to_screenshot.png differ diff --git a/res/drawable/ic_colt_logo.xml b/res/drawable/ic_colt_logo.xml new file mode 100644 index 00000000000..43c1105bfa5 --- /dev/null +++ b/res/drawable/ic_colt_logo.xml @@ -0,0 +1,17 @@ + + + + + + diff --git a/res/drawable/ic_homepage_colt.xml b/res/drawable/ic_homepage_colt.xml new file mode 100644 index 00000000000..fc61e1295dc --- /dev/null +++ b/res/drawable/ic_homepage_colt.xml @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/res/drawable/ic_homepage_themes.xml b/res/drawable/ic_homepage_themes.xml new file mode 100644 index 00000000000..5e6c2695837 --- /dev/null +++ b/res/drawable/ic_homepage_themes.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + diff --git a/res/drawable/ic_menu_play_store.xml b/res/drawable/ic_menu_play_store.xml new file mode 100644 index 00000000000..1ffc79e17f0 --- /dev/null +++ b/res/drawable/ic_menu_play_store.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/res/drawable/ic_settings_colt.xml b/res/drawable/ic_settings_colt.xml new file mode 100644 index 00000000000..b54dbef238e --- /dev/null +++ b/res/drawable/ic_settings_colt.xml @@ -0,0 +1,13 @@ + + + + diff --git a/res/drawable/ic_settings_themes.xml b/res/drawable/ic_settings_themes.xml new file mode 100644 index 00000000000..41e78d63e8c --- /dev/null +++ b/res/drawable/ic_settings_themes.xml @@ -0,0 +1,10 @@ + + + + diff --git a/res/layout/colt_logo.xml b/res/layout/colt_logo.xml new file mode 100644 index 00000000000..3ce8a726af1 --- /dev/null +++ b/res/layout/colt_logo.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/layout/fingerprint_enroll_find_sensor_graphic.xml b/res/layout/fingerprint_enroll_find_sensor_graphic.xml index 069045783e3..c35a7f164d2 100644 --- a/res/layout/fingerprint_enroll_find_sensor_graphic.xml +++ b/res/layout/fingerprint_enroll_find_sensor_graphic.xml @@ -28,6 +28,15 @@ android:src="@drawable/fingerprint_sensor_location" android:scaleType="centerInside"/> + + + + + + + + + + + + + + + + diff --git a/res/raw/aab_brightness.mp4 b/res/raw/aab_brightness.mp4 index e69de29bb2d..2483a213186 100644 Binary files a/res/raw/aab_brightness.mp4 and b/res/raw/aab_brightness.mp4 differ diff --git a/res/raw/adaptive_sleep.mp4 b/res/raw/adaptive_sleep.mp4 index e69de29bb2d..75502cb7dc2 100644 Binary files a/res/raw/adaptive_sleep.mp4 and b/res/raw/adaptive_sleep.mp4 differ diff --git a/res/raw/auto_awesome_battery.mp4 b/res/raw/auto_awesome_battery.mp4 index e69de29bb2d..446a3faa7eb 100644 Binary files a/res/raw/auto_awesome_battery.mp4 and b/res/raw/auto_awesome_battery.mp4 differ diff --git a/res/raw/fingerprint_location_animation.mp4 b/res/raw/fingerprint_location_animation.mp4 index e69de29bb2d..9f4cee0f11f 100644 Binary files a/res/raw/fingerprint_location_animation.mp4 and b/res/raw/fingerprint_location_animation.mp4 differ diff --git a/res/raw/gesture_ambient_lift.mp4 b/res/raw/gesture_ambient_lift.mp4 index e69de29bb2d..8f9cc91c79c 100644 Binary files a/res/raw/gesture_ambient_lift.mp4 and b/res/raw/gesture_ambient_lift.mp4 differ diff --git a/res/raw/gesture_ambient_tap.mp4 b/res/raw/gesture_ambient_tap.mp4 index e69de29bb2d..156988f3547 100644 Binary files a/res/raw/gesture_ambient_tap.mp4 and b/res/raw/gesture_ambient_tap.mp4 differ diff --git a/res/raw/gesture_double_tap.mp4 b/res/raw/gesture_double_tap.mp4 index e69de29bb2d..518be1a7a9f 100644 Binary files a/res/raw/gesture_double_tap.mp4 and b/res/raw/gesture_double_tap.mp4 differ diff --git a/res/raw/gesture_fingerprint_swipe.mp4 b/res/raw/gesture_fingerprint_swipe.mp4 index e69de29bb2d..0457ae81df4 100644 Binary files a/res/raw/gesture_fingerprint_swipe.mp4 and b/res/raw/gesture_fingerprint_swipe.mp4 differ diff --git a/res/raw/gesture_global_actions_panel.mp4 b/res/raw/gesture_global_actions_panel.mp4 index e69de29bb2d..9d73c8716ff 100644 Binary files a/res/raw/gesture_global_actions_panel.mp4 and b/res/raw/gesture_global_actions_panel.mp4 differ diff --git a/res/raw/gesture_prevent_ringing.mp4 b/res/raw/gesture_prevent_ringing.mp4 index e69de29bb2d..774d7f05b26 100644 Binary files a/res/raw/gesture_prevent_ringing.mp4 and b/res/raw/gesture_prevent_ringing.mp4 differ diff --git a/res/raw/gesture_twist.mp4 b/res/raw/gesture_twist.mp4 index e69de29bb2d..f1b0c55fc99 100644 Binary files a/res/raw/gesture_twist.mp4 and b/res/raw/gesture_twist.mp4 differ diff --git a/res/raw/swipe_to_screenshot.mp4 b/res/raw/swipe_to_screenshot.mp4 new file mode 100644 index 00000000000..5d3b21c8ff5 Binary files /dev/null and b/res/raw/swipe_to_screenshot.mp4 differ diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 7e686e6516e..66b9bd0ab0d 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -4448,7 +4448,7 @@ "Memory usage" "App usage" "Details" - "%1$s avg memory used in last 3 hours" + "%1$s average memory used in last 3 hours" "No memory used in last 3 hours" "Sort by avg. use" "Sort by max. use" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index 4a594b443c1..ccfc5381644 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -4448,7 +4448,7 @@ "Memory usage" "App usage" "Details" - "%1$s avg memory used in last 3 hours" + "%1$s average memory used in last 3 hours" "No memory used in last 3 hours" "Sort by avg. use" "Sort by max. use" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 907b891bbcc..f63e1fb098c 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -4448,7 +4448,7 @@ "Memory usage" "App usage" "Details" - "%1$s avg memory used in last 3 hours" + "%1$s average memory used in last 3 hours" "No memory used in last 3 hours" "Sort by avg. use" "Sort by max. use" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 11bc52cb2f1..3d8c612d366 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -4448,7 +4448,7 @@ "Memory usage" "App usage" "Details" - "%1$s avg memory used in last 3 hours" + "%1$s average memory used in last 3 hours" "No memory used in last 3 hours" "Sort by avg. use" "Sort by max. use" diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index 9af2e04dd6a..9bf767e6dbc 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -4448,7 +4448,7 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎Memory usage‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‎App usage‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎Details‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎ avg memory used in last 3 hours‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎ average memory used in last 3 hours‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎No memory used in last 3 hours‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎Sort by avg use‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎Sort by max use‎‏‎‎‏‎" diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 7d6745cb755..584c3a71242 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -153,10 +153,31 @@ Largest + + 80% + 85% + 90% + 95% + 100% + 105% + 110% + 115% + 120% + 125% + 130% + + + 0.80 0.85 - 1.0 + 0.90 + 0.95 + 1.00 + 1.05 + 1.10 1.15 + 1.20 + 1.25 1.30 diff --git a/res/values/colors.xml b/res/values/colors.xml index adee07c221e..63e138270a2 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -102,6 +102,7 @@ #5E97F6 #E51AD1 #DD4C9D + #536dfe @*android:color/material_grey_100 @*android:color/background_device_default_light diff --git a/res/values/colt_arrays.xml b/res/values/colt_arrays.xml new file mode 100644 index 00000000000..d8d499753cc --- /dev/null +++ b/res/values/colt_arrays.xml @@ -0,0 +1,63 @@ + + + + + + Warning: Insanely cool stuff ahead! + Some interesting tagline. Blah blah blah... + Get ready to be blown to the world of imagination + ColtEnigma is here + ColtEnigma, have fun with the features + ColtEnigma, It is a good thing to enter in + ColtEnigma, Our favourite customisation hub!! + Its features lickin\' good + Long live the revolution! + Look out! Behind you! + All things being equal, you are bound to lose. + What I need is a MATURE RELATIONSHIP with a FLOPPY DISK + Never let your schooling interfere with your education + Your life would be very empty if you had nothing to regret + Fame may be fleeting but obscurity is forever + This file will self-destruct in five minutes + Things are not always what they seem + Some assembly required + He who laughs last didn\'t get the joke + If everything is coming your way then you\'re in the wrong lane + Where there\'s a will, there\'s an Inheritance Tax + This is an unauthorized cybernetic announcement + No stopping or standing + If I am elected no one will ever have to do their laundry again! + When all other means of communication fail, try words + Never eat anything bigger than your head + Excessive login or logout messages are a sure sign of senility + May the Fest be with you + Haters gonna hate + Customize till you want it + Think less, customize more + FBI: Feature Base Isolation + This is what awesome looks like + With great features comes great responsibility + Don\'t dream it. Do it + + + + + @string/security_settings_fingerprint_enroll_find_sensor_message + @string/security_settings_fingerprint_enroll_find_sensor_message_front + @string/security_settings_fingerprint_enroll_find_sensor_message_left + @string/security_settings_fingerprint_enroll_find_sensor_message_right + + + diff --git a/res/values/colt_attrs.xml b/res/values/colt_attrs.xml new file mode 100644 index 00000000000..21dd08715d6 --- /dev/null +++ b/res/values/colt_attrs.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + diff --git a/res/values/colt_colors.xml b/res/values/colt_colors.xml new file mode 100644 index 00000000000..e4408d4a78e --- /dev/null +++ b/res/values/colt_colors.xml @@ -0,0 +1,21 @@ + + + + + #536dfe + + diff --git a/res/values/colt_configs.xml b/res/values/colt_configs.xml new file mode 100644 index 00000000000..97b5b5f7be9 --- /dev/null +++ b/res/values/colt_configs.xml @@ -0,0 +1,47 @@ + + + + + + + false + + + 0 + + + Scramble layout + Scramble PIN layout when unlocking device + + + Quick unlock + Unlock automatically when the correct PIN/password is entered + + + + com.android.settings.intelligence.suggestions.SuggestionService + + + + + + diff --git a/res/values/colt_strings.xml b/res/values/colt_strings.xml new file mode 100644 index 00000000000..b96d050b64b --- /dev/null +++ b/res/values/colt_strings.xml @@ -0,0 +1,99 @@ + + + + + + ColtOS + + + Colt version + Unknown + colt version + + + Maintainer + + + Device Codename + Build date + 2015-01-01-0000 + build date, build info + + + Tap to show info + + + Locate the fingerprint sensor on the front of your phone. + Locate the fingerprint sensor on the left side of your phone. + Locate the fingerprint sensor on the right side of your phone. + + + Locate the fingerprint sensor on the front of your device. + Locate the fingerprint sensor on the left side of your device. + Locate the fingerprint sensor on the right side of your device. + + + Locate the fingerprint sensor on the front of your tablet. + Locate the fingerprint sensor on the left side of your tablet. + Locate the fingerprint sensor on the right side of your tablet. + + + SELinux status + Disabled + Permissive + Enforcing + + + Google Play + + + Density options + + + Swipe to screenshot + Swipe down with three fingers to take a screenshot + + + ColtEnigma + Our favourite customization hub!! + + + Reset stats + Battery history stats are going to be reset + + + Screenshot shutter sound + + + ColtOS Themes + Monet-an artist who paints.. + + + Use custom color + Use custom color for monet engine instead of wallpaper colors + Custom color + White luminance + Use accurate shades + Chroma factor + Use linear lightness + + + Background processes + + + Wake on plug + Turn the screen on when connecting or disconnecting a power source + diff --git a/res/values/config.xml b/res/values/config.xml index 9ed7536e5f7..64f59db3235 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -63,7 +63,7 @@ - false + true false @@ -210,7 +210,7 @@ true - false + true true @@ -219,7 +219,7 @@ true - true + false true @@ -276,7 +276,7 @@ false - + intent:#Intent;action=com.android.settings.action.VIEW_ACCOUNT;category=android.intent.category.DEFAULT;launchFlags=0x8000;S.extra.callingPackageName=com.android.settings;end false diff --git a/res/values/strings.xml b/res/values/strings.xml index df409dbe645..b718c4bf0a5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2980,6 +2980,14 @@ Use accurate colors only Adjust between vivid and accurate colors + + Color balance + + Red strength + + Green strength + + Blue strength Switch orientation automatically when rotating tablet @@ -8250,6 +8258,7 @@ ignore optimizations, doze, app standby vibrant, RGB, sRGB, color, natural, standard color, temperature, D65, D73, white, yellow, blue, warm, cool + color, color balance, color correction, red, green, blue, LiveDisplay slide to unlock, password, pattern, PIN screen pinning @@ -10737,7 +10746,7 @@ Details - %1$s avg memory used in last 3 hours + %1$s average memory used in last 3 hours No memory used in last 3 hours diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml index 14429607ec2..49962f98a34 100644 --- a/res/xml/app_info_settings.xml +++ b/res/xml/app_info_settings.xml @@ -200,9 +200,16 @@ + + diff --git a/res/xml/color_mode_settings.xml b/res/xml/color_mode_settings.xml index 6044141c71f..4662e288891 100644 --- a/res/xml/color_mode_settings.xml +++ b/res/xml/color_mode_settings.xml @@ -17,4 +17,32 @@ + xmlns:settings="http://schemas.android.com/apk/res-auto" + android:title="@string/color_mode_title"> + + + + + + + + + + + + diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 621351681cd..28aeb6f5196 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -29,10 +29,10 @@ android:summary="@string/summary_placeholder" android:fragment="com.android.settings.applications.ProcessStatsSummary" /> - + android:dialogTitle="@*android:string/bugreport_title" />--> - + android:summary="@string/ota_disable_automatic_update_summary" /--> @@ -159,10 +159,10 @@ android:title="@string/enable_terminal_title" android:summary="@string/enable_terminal_summary" /> - + android:summary="@string/bugreport_in_power_summary" />--> - - - - + android:title="@string/developer_smallest_width" /--> + + + settings:controller="com.android.settings.display.FontSizePreferenceController" /> + settings:searchable="false"/> + + - + settings:controller="com.android.settings.display.SmartAutoRotatePreferenceController"/> + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + diff --git a/res/xml/swipe_to_screenshot_gesture_settings.xml b/res/xml/swipe_to_screenshot_gesture_settings.xml new file mode 100644 index 00000000000..c08156a9f52 --- /dev/null +++ b/res/xml/swipe_to_screenshot_gesture_settings.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/res/xml/theme_settings.xml b/res/xml/theme_settings.xml new file mode 100644 index 00000000000..4ef07d080c9 --- /dev/null +++ b/res/xml/theme_settings.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml index 1b949e97e26..f31cadfe2d8 100644 --- a/res/xml/top_level_settings.xml +++ b/res/xml/top_level_settings.xml @@ -1,13 +1,10 @@