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

Android: Add Insert SD Card and update the description #8708

Merged
merged 1 commit into from
Apr 16, 2020

Conversation

Ebola16
Copy link
Member

@Ebola16 Ebola16 commented Mar 30, 2020

Implements https://bugs.dolphin-emu.org/issues/10700
Follow-up to #7920.

The path is modifiable by the user so we shouldn't mention it in the description.

Copy link
Member

@JosJuice JosJuice left a comment

Choose a reason for hiding this comment

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

I think you could get this PR reviewed more easily if you split it up into several PRs, since it combines Android things and non-Android things. The four bullet points you have in the PR description sounds like a clean way to separate this into 4 PRs (or maybe 3 PRs, if you think it's better to include the last change with one of the other changes).

Source/Android/app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
Source/Android/app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
@Ebola16 Ebola16 changed the title Wii Settings changes Android: Wii Settings and description changes Mar 30, 2020
@Ebola16
Copy link
Member Author

Ebola16 commented Mar 30, 2020

@JosJuice Done. I also swapped the order of the sentences in the new Insert SD Card description to put the more important sentence first. Thanks!

@JosJuice
Copy link
Member

After looking at the code, it seems like the USB keyboard option only works on Windows, so I don't think there's much point in exposing the setting on Android.

@Ebola16 Ebola16 changed the title Android: Wii Settings and description changes Android: Add Insert SD Card and update the description Mar 30, 2020
@Ebola16
Copy link
Member Author

Ebola16 commented Mar 30, 2020

@JosJuice Done. That makes this PR simple.

Copy link
Member

@JosJuice JosJuice left a comment

Choose a reason for hiding this comment

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

LGTM, but like you mention in the description, this can't be merged in its current state without first merging PR #8711.

@Ebola16
Copy link
Member Author

Ebola16 commented Mar 31, 2020

@JosJuice Actually let's handle the default setting change in #8711 so this can get merged.

@Ebola16
Copy link
Member Author

Ebola16 commented Apr 3, 2020

@JosJuice Can this get merged?

@Ebola16
Copy link
Member Author

Ebola16 commented Apr 6, 2020

@JosJuice ?

@Ebola16
Copy link
Member Author

Ebola16 commented Apr 14, 2020

Can this get merged?

@Ebola16
Copy link
Member Author

Ebola16 commented Apr 16, 2020

Instead of me posting occasionally to get non-controversial / reviewed PRs merged, can I be allowed to merge PRs myself? I just don't want to spam @JosJuice unnecessarily for features. I won't auto-merge PRs but I'd merge PRs like this one. Issue tracker dev access would also be helpful.

@JMC47
Copy link
Contributor

JMC47 commented Apr 16, 2020

Things have been a bit slow with reviews due to the current circumstances. This has an approval already so I'll merge it once I've gone through everything. I'm not a good coder so all I can do is test things, though this one does have a code approval making things easier.

@JMC47 JMC47 merged commit 19fc43f into dolphin-emu:master Apr 16, 2020
@Ebola16 Ebola16 deleted the Wii branch April 16, 2020 22:37
@Ebola16
Copy link
Member Author

Ebola16 commented Apr 16, 2020

@JMC47 I understand that and thanks for merging this. That's why I suggested allowing me to merge PRs, It will make me sound less nagging and allow me to merge prerequisite PRs for future work.

@JosJuice
Copy link
Member

@Ebola16 I've given you dev access on the issue tracker. Let me know if it doesn't work.

The requirements for getting merge rights in this repo are stricter (and I don't have the ability to give people merge rights anyway).

@Ebola16
Copy link
Member Author

Ebola16 commented Apr 17, 2020

@JosJuice Thank you! No worries about merge rights, I was just trying to find the right balance between spamming notifications and getting things merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants