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

Updated from upstream #2

Merged
merged 22 commits into from Jul 6, 2015
Merged

Updated from upstream #2

merged 22 commits into from Jul 6, 2015

Conversation

haswalt
Copy link

@haswalt haswalt commented Jul 6, 2015

No description provided.

aron and others added 22 commits September 6, 2014 17:17
Fixes an issue in landscape on iPhone 6 where the frame is incorrect.
…ore. Added ability to change enter passcode label's text.
also removed compiler warning for [string sizeWithFont:]
Ignored appearances and enter passcode label text setter
Conflicts:
	ABPadLockScreen/ABPadLockScreenSetupViewController.m
Fixed rotation issue on iPhone 6 Plus
Updated example project to remove background and add in colors
@@ -343,7 +351,12 @@ - (void)setBackgroundView:(UIView *)backgroundView

[_backgroundView setFrame:self.bounds];
[_backgroundView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
[self insertSubview:_backgroundView belowSubview:_backgroundBlurringView];
if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1) {
//[_backgroundView addSubview:_backgroundBlurringView];

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cocwoc

johankool added a commit that referenced this pull request Jul 6, 2015
@johankool johankool merged commit a648e55 into egeniq-forks:master Jul 6, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants