Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x #30

Open
wants to merge 34 commits into
base: lp5.1
Choose a base branch
from
Open

x #30

wants to merge 34 commits into from

Conversation

lozo2010
Copy link

No description provided.

lozo2010 and others added 30 commits June 20, 2015 00:02
This is a rework of the initial layers type 2 commit:

Layers : Exposing hard coded resources for type 2 overlay access [2/6]
Author: bgill55
BitSyko/platform_packages_apps_Settings@0626c47

Layers_: Add exposed values for Data Usage Chart
Author: Thyrus11
BitSyko/platform_packages_apps_Settings@fa61e97

Changes naming conventions to coexist with CMTE/AOSP naming

New colors files for state handling:
Thanks to Andrew Dodd's commit:
https://gerrit.omnirom.org/#/c/11868/

Add new colors exposed in layouts and colors from CM commit:
Expose hardcoded and @android colors from layouts
Author:0xD34D
CyanogenMod/android_packages_apps_Settings@95b3de6

Make colors backwards compatible with layers previous commits based on:
Author: Andrew Dodd
https://gerrit.omnirom.org/#/c/12695/

Change-Id: I431c50e5c1720b3c3d70c4c2f9b5f58eed48de81
…acted stock.

MODIFIED:
        - SETTINGS - Dashboard Card Background exposed to allow themers to theme with a .png, complex .xml, or still use the existing method with <color name="exposed_bg_dark>.
                - res/layout/dashboard_category.xml referenced background with @color/exposed_bg_dark, but changed to @drawable/dashboard_background_exposed.xml.
                - res/drawable/dashboard_background_exposed.xml Uses <layer-list> and references @color/exposed_bg_dark to enable old themes to remain intact and
                  to make sure stock is not impacted.

        - SETTINGS - Main Backgound behind Dashboard Cards exposed to allow themers to theme with a .png, complex .xml, or still use the existing method with
                     <color name="dashboard_background_color">.
                   - res/drawable/settings_main_background_exposed.xml Uses <layer-list> and references @color/dashboard_background_color to enable old themes to
                     remain intact and to make sure stock is not impacted.

        - VALUES - Color.xml was modified a little to make sure stock is not impacted.
                 - res/values/colors.xml The color used to change main dashboard background is <color name="dashboard_background_color">#ffe1e1e0</color> it was
                   modified to be #ffffff instead of #ffe1e1e0 to make sure stock is not impacted.

- KEEP NOTED
        - Old themes and Stock will not see in any difference with this commit this is just giving themers options to provide a better user experience.

- NOTABLE MENTION
        - Thank you Mike Williams with some ideas on how to make this happen.

-------

Patchset 2:
** Minor fix to allow better compatibility with other themes not utilizing the
   settings exposed background .xmls in their themes.
** Changed @color/ reference in drawable/dashboard_background_exposed.xml and
   drawable/settings_main_background_exposed.xml

Change-Id: Id5a3c3035f0c50910bc55556859a6d028b85e5da
Due to themes that contain edited preference_background.xml

Change-Id: I132c6db52d6b454fbd39160c73a4a89d6453aafc
Add "Screen Color" item in settings.
This function support set Hue, Saturation, Contrast and Intensity value,
and screen color will be changed by this settings.

Change-Id: If6f6e7ee7f28862476a8b955cd3252175fefa2a1

Settings : Fix CustomScreenColor when picking an image

Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12

Settings: Start service as explicit intent

Needed for API level 21. Add some ressource bits, set text color to
white.

Change-Id: I9c4a9139be69fa5c6d6c74055b5475f0d930c93a

Conflicts:
	AndroidManifest.xml
	res/values/config.xml
	res/values/slim_colors.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	AndroidManifest.xml
	res/values/config.xml
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/CustomScreenColor.java
	src/com/android/settings/DisplaySettings.java
Change-Id: I9c75fce25c07e5e02377ca95974255f13af682a0
PS ezio:
- Move ime cursors setting to the navbar menu (and disable
switch if navbar is disabled)

----

Fix file permissions.

Change-Id: Ibecf4851a2a36417360dc3290c17fbffc225fea0

Conflicts:
	res/values-it/slimmod_strings.xml

Move ime cursors setting to the navbar menu

Change-Id: I8053279f951aca8444a390435d48c0dd38c5bb8e

ime cursors: fix build and add switch dependency

Change-Id: I2467ad1dc4aef1dd84748a2b5a2542c61b5342d3
Change-Id: Ib673d278d23423fe6885c73f1eb3dd858633e5b6

Conflicts:
	res/values/slim_strings.xml
	res/xml/display_settings.xml
Change-Id: Ib673d278d23423fe6885c73f1eb3dd858633e5b6

Conflicts:
	res/values/slim_strings.xml
	res/xml/display_settings.xml
Change-Id: I7bdd1081114b40cc2ab6372d16bb247401f83a86
…Settings into lp5.1

Conflicts:
	res/values/slim_arrays.xml
	res/values/strings.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants