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

Support for API 22 #2030

Merged
merged 9 commits into from Sep 14, 2015
Merged

Support for API 22 #2030

merged 9 commits into from Sep 14, 2015

Conversation

@jongerrish
Copy link
Contributor

@jongerrish jongerrish commented Sep 10, 2015

Added missing methods to RoboWebSettings.
Make RobolectricActivityManager implement all API 22 methods.
Added conditional for ShadowLocaleData percent is now a String

Jonathan Gerrish added 6 commits Sep 9, 2015
Added missing methods to RoboWebSettings.java
# Conflicts:
#	robolectric-shadows/shadows-core/src/main/resources/android/app/RobolectricActivityManager.java.vm
#	robolectric-shadows/shadows-core/src/main/resources/org/robolectric/shadows/ShadowLocaleData.java.vm
… s copy the implementation from API 21 as a shadow implementation.

CookieManager is now an abstract class rather than a class of empty implementations. Create RobolectricCookieManager to provide these impleemntations and move the shadow implementations there.

Removed test in ShadowCookieManagerSyncTest and non-implementation methods from ShadowCookieManager as it is
only used from ShadowCookieSyncManagerTest whose class under test is deprecated and just calls through anyway.
@jongerrish jongerrish changed the title Added build config for API 22 Support for API 22 Sep 10, 2015
Jonathan Gerrish added 3 commits Sep 11, 2015
…agerService() which always returned null

service on previous SDKs but since 22 now will make recursive calls till it gets a non-null.
…dicating explicitly empty rather than undefined.

The best documentation of this can be seen in the following commit:-

https://android.googlesource.com/platform/frameworks/base/+/f296940%5E!/
@erd erd merged commit b09519d into robolectric:master Sep 14, 2015
@erd erd mentioned this pull request Sep 14, 2015
kriegfrj pushed a commit to kriegfrj/robolectric that referenced this pull request Sep 15, 2015
@cperry-gpsw
Copy link

@cperry-gpsw cperry-gpsw commented Oct 13, 2015

What version of Robolectric is this in?

@erd
Copy link
Member

@erd erd commented Oct 13, 2015

3.1-SNAPSHOT

ismail-s added a commit to ismail-s/KISS that referenced this pull request Nov 20, 2015
See robolectric/robolectric#2030 for more details.
@jongerrish jongerrish deleted the jongerrish:support_api_22 branch Feb 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants