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

settings: Add home button unlock option (2/2) @invisiblek #1

Merged
merged 1 commit into from
Oct 24, 2012
Merged

settings: Add home button unlock option (2/2) @invisiblek #1

merged 1 commit into from
Oct 24, 2012

Conversation

corcoran
Copy link

Adds modified CM10 patch for home button unlock (by invisiblek). Matches d2-common patch in SlimRoms: SlimRoms/device_samsung_d2-common@57ac03d

krarvind added a commit that referenced this pull request Oct 24, 2012
settings: Add home button unlock option (2/2) @invisiblek
@krarvind krarvind merged commit 2daf8f6 into SlimRoms:jb Oct 24, 2012
letmedanz added a commit to letmedanz2/packages_apps_Settings that referenced this pull request Mar 14, 2015
- Patch SlimRoms#1: Remove Slim HeadsUp custom featurese

  ** Patchset by @CPA-Poke <brock.shahan@cox.net> **

- Patch SlimRoms#2: HeadsUp options [2/2]

  ** Patchset by @LinuxXxxX <io.nolinuxnoparty@gmail.com> **

  * Includes:
     * Settings: forward port HeadsUp options [2/2]
     * Global on/off
     * Blacklist and Do not disturb
     * HeadsUp settings: fix enabled state on clean install
     * Swype action selector (delete/hide)
     * @CPA-Poke: adapted to LiquidSmooth based on @cristianomatos'
       adaptation for crdroid

- Patch SlimRoms#3: HeadsUp: add timeout option (2/2)

  ** Patchset by @kufikugel **

- Patch SlimRoms#4: [Heads up Swipe] A more user friendly summary

  ** Patchset by @cristianomatos <cristianobmatos@gmail.com> **

- Patch SlimRoms#5: [Heads up] Touch to hide (2/2)

  ** Patchset by @cristianomatos <cristianobmatos@gmail.com> **

Change-Id: I4c29005879e55eca7f4f32b6e7af4c96ac4005df

Conflicts:
	AndroidManifest.xml
	res/values/liquid_strings.xml
	res/values/slim_arrays.xml
	res/xml/liquid_notifications_settings.xml
	src/com/android/settings/liquid/LiquidnotificationSettings.java
kagwind pushed a commit to kagwind/packages_apps_Settings that referenced this pull request Mar 21, 2015
- Patch SlimRoms#1: Remove Slim HeadsUp custom featurese

  ** Patchset by @CPA-Poke <brock.shahan@cox.net> **

- Patch SlimRoms#2: HeadsUp options [2/2]

  ** Patchset by @LinuxXxxX <io.nolinuxnoparty@gmail.com> **

  * Includes:
     * Settings: forward port HeadsUp options [2/2]
     * Global on/off
     * Blacklist and Do not disturb
     * HeadsUp settings: fix enabled state on clean install
     * Swype action selector (delete/hide)
     * @CPA-Poke: adapted to LiquidSmooth based on @cristianomatos'
       adaptation for crdroid

- Patch SlimRoms#3: HeadsUp: add timeout option (2/2)

  ** Patchset by @kufikugel **

- Patch SlimRoms#4: [Heads up Swipe] A more user friendly summary

  ** Patchset by @cristianomatos <cristianobmatos@gmail.com> **

- Patch SlimRoms#5: [Heads up] Touch to hide (2/2)

  ** Patchset by @cristianomatos <cristianobmatos@gmail.com> **

Change-Id: I4c29005879e55eca7f4f32b6e7af4c96ac4005df

Conflicts:
	AndroidManifest.xml
	res/values/liquid_strings.xml
	res/values/slim_arrays.xml
	res/xml/liquid_notifications_settings.xml
	src/com/android/settings/liquid/LiquidnotificationSettings.java

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
Thrilleratplay pushed a commit to Thrilleratplay/packages_apps_Settings that referenced this pull request Jun 18, 2016
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.

2 participants