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

Add gesture locking #81

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add gesture locking #81

wants to merge 7 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Mar 9, 2016

Hi Max,

As discussed on XDA, please check this pull request. Some points to note are

  • In translated strings.xml, I have added the untranslated strings directly, to allow compilation.
  • I have used a non AOSP GestureOverlayView.java because the AOSP version clears the gesture after it is drawn.

You may want to refactor some stuff as per your preferences, but I have tried to do the best I could. Thanks for your time.

@Maxr1998
Copy link
Owner

Maxr1998 commented Mar 9, 2016

Very clean code, thanks! I'll look through it in detail in the next days, depending how much time I have; then I'll merge and reformat it a little to my needs :)

@ghost
Copy link
Author

ghost commented Mar 9, 2016

You may also want to look at the theme manager's application on the Gesture View, I did not touch it at all.

@Maxr1998
Copy link
Owner

Maxr1998 commented Mar 9, 2016

@Rijul-Ahuja Theme manager isn't implemented, tbh.. So you don't have to change anything about it ;)

@ghost
Copy link
Author

ghost commented Mar 18, 2016

Max, just thought I should mention this, the gesture file isn't encrypted at all, unlike the other modes. If you figure out a way to encrypt the gesture (that is, not just the name, but the actual gesture itself), do let me know, I will implement it in the gesture lockscreen module.

@Maxr1998
Copy link
Owner

Thanks! I'll see if I can do it on my own :) I will work on fixing a few things in MaxLock now, and then I'll merge your PR.

else
mPassword = getPreferencesKeys(getContext()).getString(Common.KEY_PREFERENCE, "");
}
Log.e(LockView.class.getName(), mPassword);
Copy link
Owner

Choose a reason for hiding this comment

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

Could you remove logging th password nd locking type, please?

Copy link
Author

Choose a reason for hiding this comment

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

Apologies, that was for debugging. Right now I've exams, so I'll remove it
after ~13 hours (two exams today).

Copy link
Owner

Choose a reason for hiding this comment

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

Oh, no prob. It can wait until later/tomorrow. Good luck with your exams!

@Maxr1998
Copy link
Owner

Could you take a look at my line note? Also, could you remove the alternate translations? I think the translators should pick the new strings out on their own.

@Maxr1998
Copy link
Owner

Perfect, thanks!

@Maxr1998 Maxr1998 self-assigned this Mar 21, 2016
@Maxr1998
Copy link
Owner

I decided I won't merge this before next release. I want to have the new release as stable as possible, and out as soon as possible..

@ghost
Copy link
Author

ghost commented Mar 25, 2016

Sure, it is your app. Just put up a comment here when you are done so I get to know.
PS : Are your translators volunteers you found, or did they find you?

@Maxr1998
Copy link
Owner

Of course. I will just tell here.
Actually, both. Many are just users who asked to translate, but I also asked one or two of my users to do the translations.
BTW, it seems I broke this PR with my last changes (sorry!). Could you take a look at it?

@ghost
Copy link
Author

ghost commented Mar 25, 2016

Can you tell me how to look at it? I am not well versed with git. A general idea of what to Google will do, too.

@Maxr1998
Copy link
Owner

Well, you have to adapt my changes to your proposes. So you have to pull my updates from my git and then fix the conflicts. I can also do it, but it would be very nice if you could do it :)

@Maxr1998
Copy link
Owner

@Rijul-Ahuja
Would it be ok for you if I merged this manually? You won't be listed as contributor in the GitHub stats then, but I'll include you in the about screen as sole creator of Gesture lockscreen.

@Maxr1998
Copy link
Owner

Also, could you tell me which files you took from the AOSP? Only the ones with the copyright?

@Maxr1998
Copy link
Owner

And another question, what is the reason for first extending LockGestureView from GestureOverlayView, then GestureActivityView from LockGestureView?
Can't I just merge the non-AOSP views?

@ghost
Copy link
Author

ghost commented Apr 14, 2016

Sorry, I totally forgot about this commit.

  1. Manual works, I don't mind. If there is a link, please link to fb.com/rijul.ahuja
  2. No files from AOSP, they are from Temasek. temasek/android_frameworks_base@d89f57b and temasek/android_packages_apps_Settings@8fea9e7
  3. LockGestureView is used in the GestureSetupFragment and GestureActivityView is used in the lock activity, because they use different methods of authentication. (GestureSetupFragment saves in the gesture file, while the GestureActivityView calls the parent activity to match the gesture, like you do with the knock code and stuff, using an authenticationSucceededListener).

Can't I just merge the non-AOSP views?
I don't understand what this means.

@Maxr1998
Copy link
Owner

  1. Sure, will add that link.
  2. Thanks, then I'll mention them in the credits.
  3. Ah, I see, silly me. Then of course you need different views.

Forget about my other request, basically wanted to merge fragment and activity code, which doesn't work.

@ghost
Copy link
Author

ghost commented May 6, 2016

Any movement on this, Max?

@Maxr1998
Copy link
Owner

Maxr1998 commented May 6, 2016

Yeah, I will add it next when I find time for MaxLock again

@Maxr1998 Maxr1998 force-pushed the master branch 2 times, most recently from 4b492d0 to b50d2ca Compare March 18, 2017 12:55
@Maxr1998 Maxr1998 force-pushed the master branch 3 times, most recently from 502e98b to 059f373 Compare April 21, 2017 21:49
@Maxr1998 Maxr1998 added this to the 7.1 milestone Nov 1, 2017
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.

1 participant