Skip to content

Commit 9f66a01

Browse files
EdmondChuiHWEdmondChuiHW
committed
fixed 'up' button showing up on DoneDiscardActivity on new Android versions
1 parent 6043b79 commit 9f66a01

23 files changed

+121
-327
lines changed

‎.DS_Store

6 KB
Binary file not shown.

‎EdmondAppsAndroidUtils.iml

+6-49
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android" name="Android">
55
<configuration>
66
<option name="LIBRARY_PROJECT" value="true" />
7-
<option name="UPDATE_PROPERTY_FILES" value="true" />
87
</configuration>
98
</facet>
109
</component>
1110
<component name="NewModuleRootManager" inherit-compiler-output="false">
1211
<output url="file://$MODULE_DIR$/target/classes" />
1312
<output-test url="file://$MODULE_DIR$/target/test-classes" />
14-
<exclude-output />
1513
<content url="file://$MODULE_DIR$">
16-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" />
17-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" />
18-
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" />
19-
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" />
20-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" isTestSource="false" />
21-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test" isTestSource="true" />
22-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test" isTestSource="true" />
23-
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test" isTestSource="true" />
24-
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test" isTestSource="true" />
25-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test" isTestSource="true" />
26-
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/aidl" isTestSource="false" />
27-
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" isTestSource="false" />
28-
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" />
29-
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/jni" isTestSource="false" />
30-
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" />
31-
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" isTestSource="false" />
32-
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" isTestSource="false" />
33-
<sourceFolder url="file://$MODULE_DIR$/assets" isTestSource="false" />
34-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
35-
<sourceFolder url="file://$MODULE_DIR$/res" isTestSource="false" />
36-
<sourceFolder url="file://$MODULE_DIR$/tests/aidl" isTestSource="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/tests/assets" isTestSource="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/tests/java" isTestSource="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/tests/jni" isTestSource="true" />
40-
<sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/tests/res" isTestSource="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/tests/resources" isTestSource="true" />
43-
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
14+
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
4415
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
45-
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
46-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
47-
<excludeFolder url="file://$MODULE_DIR$/.git" />
48-
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
49-
<excludeFolder url="file://$MODULE_DIR$/.idea" />
50-
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
51-
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
52-
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
53-
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
54-
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
55-
<excludeFolder url="file://$MODULE_DIR$/build/exploded-bundles" />
56-
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
57-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
58-
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
59-
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
60-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
16+
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
17+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6118
<excludeFolder url="file://$MODULE_DIR$/target" />
6219
</content>
6320
<orderEntry type="inheritedJdk" />
6421
<orderEntry type="sourceFolder" forTests="false" />
65-
<orderEntry type="library" exported="" name="com.google.code.gson:gson:2.2.4" level="application" />
66-
<orderEntry type="library" exported="" name="android-support-v4" level="application" />
22+
<orderEntry type="library" name="Maven: com.android.support:support-v4:19.0.0" level="project" />
23+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
6724
</component>
6825
</module>
6926

‎pom.xml

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<groupId>com.edmondapps</groupId>
7+
<artifactId>EdmondAppsAndroidUtils</artifactId>
8+
<version>1.0-SNAPSHOT</version>
9+
10+
<name>${artifactId}</name>
11+
<description>An Android library aimed to reduce common boiler-plate code.</description>
12+
<url>https://github.com/chuihinwai/EdmondAppsAndroidUtils</url>
13+
14+
<parent>
15+
<groupId>org.sonatype.oss</groupId>
16+
<artifactId>oss-parent</artifactId>
17+
<version>7</version>
18+
</parent>
19+
20+
<licenses>
21+
<license>
22+
<name>Apache License Version 2.0</name>
23+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
24+
<distribution>repo</distribution>
25+
</license>
26+
</licenses>
27+
28+
<scm>
29+
<url>https://github.com/chuihinwai/EdmondAppsAndroidUtils</url>
30+
<connection>scm:git:git://github.com/chuihinwai/EdmondAppsAndroidUtils.git</connection>
31+
<developerConnection>scm:git:[email protected]:chuihinwai/EdmondAppsAndroidUtils.git</developerConnection>
32+
</scm>
33+
34+
<developers>
35+
<developer>
36+
<name>Edmond Chui</name>
37+
<url>https://github.com/chuihinwai</url>
38+
</developer>
39+
</developers>
40+
41+
<properties>
42+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
43+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
44+
<java.version>1.6</java.version>
45+
<android.version>4.1.1.4</android.version>
46+
<android.platform>18</android.platform>
47+
<android-maven.version>3.6.1</android-maven.version>
48+
</properties>
49+
50+
<dependencies>
51+
<dependency>
52+
<groupId>com.android.support</groupId>
53+
<artifactId>support-v4</artifactId>
54+
<version>19.0.0</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.google.code.gson</groupId>
58+
<artifactId>gson</artifactId>
59+
<version>2.2.4</version>
60+
</dependency>
61+
</dependencies>
62+
63+
<dependencyManagement>
64+
<dependencies>
65+
<dependency>
66+
<groupId>com.google.android</groupId>
67+
<artifactId>android</artifactId>
68+
<version>${android.version}</version>
69+
<scope>provided</scope>
70+
</dependency>
71+
</dependencies>
72+
</dependencyManagement>
73+
<build>
74+
<pluginManagement>
75+
<plugins>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-compiler-plugin</artifactId>
79+
<version>2.3.2</version>
80+
</plugin>
81+
<plugin>
82+
<groupId>org.apache.maven.plugins</groupId>
83+
<artifactId>maven-release-plugin</artifactId>
84+
<version>2.3.2</version>
85+
<configuration>
86+
<tagNameFormat>v@{project.version}</tagNameFormat>
87+
</configuration>
88+
</plugin>
89+
<plugin>
90+
<groupId>org.apache.maven.plugins</groupId>
91+
<artifactId>maven-gpg-plugin</artifactId>
92+
<configuration>
93+
<homedir>${user.home}/.gnupg-old</homedir>
94+
</configuration>
95+
</plugin>
96+
<plugin>
97+
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
98+
<artifactId>android-maven-plugin</artifactId>
99+
<version>${android-maven.version}</version>
100+
<configuration>
101+
<sdk>
102+
<platform>${android.platform}</platform>
103+
</sdk>
104+
<undeployBeforeDeploy>true</undeployBeforeDeploy>
105+
</configuration>
106+
<extensions>true</extensions>
107+
</plugin>
108+
</plugins>
109+
</pluginManagement>
110+
<sourceDirectory>src/main/java</sourceDirectory>
111+
<testSourceDirectory>src/test</testSourceDirectory>
112+
</build>
113+
</project>

‎project.properties

+1
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ android.library=true
1818

1919

2020

21+

‎src/main/java/com/edmondapps/utils/android/activity/DoneDiscardActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public void onClick(View v) {
6262
actionBar.setDisplayShowCustomEnabled(true);
6363
actionBar.setDisplayShowHomeEnabled(false);
6464
actionBar.setDisplayShowTitleEnabled(false);
65+
actionBar.setDisplayHomeAsUpEnabled(false);
6566
actionBar.setCustomView(view, new ActionBar.LayoutParams(MATCH_PARENT, MATCH_PARENT));
6667
}
6768

‎target/classes/drawable-hdpi/ic_action_discard.png

-1.25 KB
Binary file not shown.

‎target/classes/drawable-hdpi/ic_action_done.png

-1.3 KB
Binary file not shown.

‎target/classes/drawable-mdpi/ic_action_discard.png

-1.11 KB
Binary file not shown.

‎target/classes/drawable-mdpi/ic_action_done.png

-1.16 KB
Binary file not shown.

‎target/classes/drawable-xhdpi/ic_action_discard.png

-1.32 KB
Binary file not shown.

‎target/classes/drawable-xhdpi/ic_action_done.png

-1.56 KB
Binary file not shown.

‎target/classes/layout/ed__ab_custom_view_done_discard.xml

-14
This file was deleted.

‎target/classes/layout/ed__ab_discard_button.xml

-21
This file was deleted.

‎target/classes/layout/ed__ab_done_button.xml

-20
This file was deleted.

‎target/classes/layout/ed__layout_dual_pane.xml

-38
This file was deleted.

‎target/classes/layout/ed__layout_single_pane.xml

-24
This file was deleted.

‎target/classes/layout/ed__layout_view_pager.xml

-21
This file was deleted.

‎target/classes/values-sw600dp/bools.xml

-21
This file was deleted.

‎target/classes/values-sw720dp/bools.xml

-22
This file was deleted.

0 commit comments

Comments
 (0)