mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/commons-app/master'

Browse source
This commit is contained in:
Josephine Lim 2017-03-03 18:43:01 +10:00
commit 24c02de07c
6 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file

@ -172,7 +172,7 @@ public class ContributionsListFragment extends Fragment {
} }
@Override @Override
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
switch (requestCode) { switch (requestCode) {
// 1 = Storage allowed when gallery selected // 1 = Storage allowed when gallery selected
case 1: { case 1: {

2
app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java
View file

@ -108,7 +108,7 @@ public class MultipleShareActivity
} }
@Override @Override
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
if (requestCode == 1) { if (requestCode == 1) {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
multipleUploadBegins(); multipleUploadBegins();

2
app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -324,7 +324,7 @@ public class ShareActivity
@Override @Override
public void onRequestPermissionsResult(int requestCode, public void onRequestPermissionsResult(int requestCode,
String permissions[], int[] grantResults) { String[] permissions, int[] grantResults) {
switch (requestCode) { switch (requestCode) {
// 1 = Storage (from snackbar) // 1 = Storage (from snackbar)
case 1: { case 1: {

6
app/src/main/res/values-v14/styles.xml
View file

@ -1,6 +0,0 @@
<resources>
<style name="ProgressBar" parent="android:Widget.Holo.ProgressBar.Horizontal" />
<style name="AppTheme" parent="android:Theme.Holo" />
</resources>

5
app/src/main/res/values-v9/styles.xml
View file

@ -1,5 +0,0 @@
<resources>
<style name="ProgressBar" parent="android:Widget.ProgressBar.Horizontal" />
</resources>

2
app/src/main/res/values/styles.xml
View file

@ -19,4 +19,6 @@
<style name="NotificationProgress" parent="AppTheme" /> <style name="NotificationProgress" parent="AppTheme" />
<style name="ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
</resources> </resources>