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

microG Settings in AppInfo and SystemSettings (+ adaptive icon) #719

Merged
merged 3 commits into from Mar 10, 2019

Conversation

Nanolx
Copy link
Contributor

@Nanolx Nanolx commented Mar 1, 2019

Show microG Settings not just in Launcher, but also in

  • AppInfo (System Settings > Apps > All Apps > microG Services Core; depending on the ROM version either a gear icon will appear or a new entry for additional settings)
  • Device Settings (System Settings > Device (or corresponding category, depending on the ROM version))

Also includes Adaptive icon and updated strings.xml for C, de and ru.

This commit is the result of manually squashed commits by me and @Vavun found in my fork's master branch. Reportedly working according to all testers accross different Android versions.

[I'm really sorry... but I wanted a clean pull request but somehow I've managed to mess up submodules twice]

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
Copy link
Member

Choose a reason for hiding this comment

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

What is the source and license of this icon? Looks like it could be an original Google file (even though it's not very complex), so please verify it is not or at least properly licensed. Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right. I just accepted the pull request over at my fork without further checking. I'll create a new drawable from the official microG icon.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added new drawable based on artwork/ic_microg_settings.svg, should be fine now.

@mar-v-in mar-v-in merged commit 9e405cd into microg:master Mar 10, 2019
@ale5000-git
Copy link
Member

ale5000-git commented Mar 11, 2019

@Nanolx
@Vavun
Is it possible to also include an option to add a Google account directly inside microG options?
It will fix problems on ROMs where it is missing, ref #413

@Vavun
Copy link
Contributor

Vavun commented Mar 11, 2019

@ale5000-git
Something like this ?

https://github.com/Vavun/android_packages_apps_GmsCore/blob/patch-5/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA.PNG
( Add account and call location picker )

https://github.com/Vavun/android_packages_apps_GmsCore/tree/patch-5
Compare to see changes.

PS
To be honest that is not really correct way

@ale5000-git
Copy link
Member

ale5000-git commented Mar 11, 2019

@Vavun:
Could you please rebase your fork (and the patch-5 branch) to the latest master?
So it is easier to see the changes not yet merged.

@Vavun
Copy link
Contributor

Vavun commented Mar 11, 2019

@ale5000-git just see compare like this master...Vavun:patch-5

My fork is a fork of Nanolx fork with some branches with pull requests to vanila microg
So I am also confused in all this, I need to remove and start from scratch.

I never use github before this so I am afraid to touch anything not to completely break everything.

Sorry for mess and bad english

@ale5000-git
Copy link
Member

ale5000-git commented Mar 11, 2019

@Vavun

Currently the main problem is: what is the license of the images you added?
Where they come from?
Are they compatible with Apache-2.0 license of microG?

@Vavun
Copy link
Contributor

Vavun commented Mar 11, 2019

@ale5000-git I took them here
https://github.com/google/material-design-icons
The license is Apache 2.0

@Nanolx
Copy link
Contributor Author

Nanolx commented Mar 11, 2019

@Vavun you may re-base your fork on the last stable version:

git checkout -b fancy-new-branch v0.2.6.13280

and then you can git remote add, git fetch and git merge latest upstream and re-apply the change.

@ale5000-git
Copy link
Member

@Vavun: I have created the pull request here => #727

@Vavun
Copy link
Contributor

Vavun commented Apr 16, 2019

@Nanolx Hi again

It seems that mar-v-in seriously set to work again

Perhaps this pull request should be updated with the latest changes ?
Nanolx#5
Nanolx#11
Nanolx#9

@Nanolx
Copy link
Contributor Author

Nanolx commented Apr 16, 2019

I'll rebase my fork this weekend and sent in pull requests - sorry for the delay.

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.

None yet

4 participants