Permalink
Commits on Dec 9, 2016
  1. Merge pull request #2756 from robolectric/rollback_broken_resources_fix

    Revert "Style references should be resolved against the resource load…
    jongerrish committed on GitHub Dec 9, 2016
  2. Merge branch 'master' into rollback_broken_resources_fix

    jongerrish committed on GitHub Dec 9, 2016
  3. Revert "Style references should be resolved against the resource load…

    …er from the declaring AttributeSet if possible."
    
    This reverts commit 5078a80.
    
    This caused some breakages in client projects, we'll look at another way of solving this issue.
    Jonathan Gerrish committed Dec 9, 2016
Commits on Dec 7, 2016
  1. Merge pull request #2748 from hoisie/cleanup-directlyon

    Perform minor cleanup in ShadowIcon.java
    jongerrish committed on GitHub Dec 7, 2016
  2. Merge pull request #2753 from jck112/resolve-attributes

    Fix getThemeValue style resolution
    jongerrish committed on GitHub Dec 7, 2016
  3. Merge pull request #2743 from robolectric/api_25

    Add support for API 25 Runtime
    jongerrish committed on GitHub Dec 7, 2016
  4. Fix failing test

    Jonathan Gerrish committed Dec 7, 2016
  5. Fix getThemeValue style resolution

    The resolveRefs parameter is meant to control whether resource values
    should be resolved. It should always resolve style references.
    
    Also use AttributeResource#getStyleReference() to correctly handle
    cases where an attribute refers to another attribute in a different
    package (e.g. ?attr/selectableItemBackground ->
    ?android:attr/selectableItemBackground).
    jck112 committed Dec 7, 2016
  6. Perform minor cleanup in ShadowIcon.java

    Switch to using the two-argument directlyOn and add @HiddenApi
    annotation.
    hoisie committed Dec 7, 2016
  7. Merge branch 'master' into api_25

    jongerrish committed on GitHub Dec 7, 2016
  8. Prefer new Binder() to creating a dynamic proxy

    jongerrish committed Dec 7, 2016
  9. Add gradle configuration for API 25

    Add SdkConfig for API 25
    Prefer to use ReflectionHelpers.createNullProxy() rather than hand coded stubs of Framework classes as it is tollerant to framework API changes.
    Use API 24 RuntimeAdapter for API 25
    jongerrish committed Dec 1, 2016
  10. Bump API 23 from 6.0.0_r1 to 6.0.1_r3

    jongerrish committed Dec 6, 2016
Commits on Dec 6, 2016
  1. Style references should be resolved against the resource loader from …

    …the declaring AttributeSet if possible.
    xian committed Dec 6, 2016
Commits on Dec 3, 2016
  1. Merge pull request #2742 from robolectric/cache_app_resources_only_on…

    …ce_across_all_apis
    
    Performance + Memory improvements - Application's resource loader is …
    xian committed on GitHub Dec 3, 2016
  2. Merge branch 'master' into cache_app_resources_only_once_across_all_apis

    xian committed on GitHub Dec 3, 2016
Commits on Dec 2, 2016
  1. Merge pull request #2740 from robolectric/fix-shadow-icon-test

    android.graphics.drawable.Icon was added in Marshmallow.
    jongerrish committed on GitHub Dec 2, 2016
  2. Performance + Memory improvements - Application's resource loader is …

    …no longer tied to the Android Runtime's resource loader so we don't need to cache per sdk. Also cache the compile time SDK resource loader as this is constant across all tests.
    Jonathan Gerrish committed Dec 2, 2016
  3. Merge pull request #2737 from robolectric/fix-shadows-not-a-subtype-e…

    …rror
    
    Reset main thread's context ClassLoader even if shadow resetters fail.
    jongerrish committed on GitHub Dec 2, 2016
  4. android.graphics.drawable.Icon was added in Marshmallow.

    xian committed Dec 2, 2016
Commits on Dec 1, 2016
  1. Add minSdk to ShadowIcon.

    xian committed Dec 1, 2016
  2. Merge pull request #2739 from hidroh/job-scheduler

    Cancelling job with ID to remove it from shadow scheduled jobs
    jongerrish committed on GitHub Dec 1, 2016
  3. Reset main thread's context ClassLoader even if shadow resetters fail.

    This fixes the occasional "org.robolectric.internal.ShadowProvider:
    Provider org.robolectric.Shadows not a subtype" exceptions.
    xian committed Dec 1, 2016
  4. Merge pull request #2736 from robolectric/resources

    Fix resolution of resource references not present in the runtime SDK
    xian committed on GitHub Dec 1, 2016
  5. Fix SDK for Robolectric tests

    Robolectric tests must be compiled against the latest Android SDK, which
    may not be supported on JDK 7. Run tests using the latest supported SDK
    depending on the current JDK.
    xian committed Dec 1, 2016
Commits on Nov 30, 2016
  1. When AttributeSet has a resource reference take the resId out of the …

    …AttributeSet.
    jongerrish committed Nov 30, 2016
  2. Use ShadowAssetManager.getResourceLoader() methods now that ShadowAss…

    …etManager.convertAndFill() is non-static.
    jongerrish committed Nov 30, 2016
  3. Move Converter.convertAndFill() to ShadowAssetManager, its only call …

    …site (and has no direct tests).
    
    Make convertAndFill() non-static and avoid the need to pass in ResourceLoader.
    Remove unnecessary null checks for AttributeResource parameter
    jongerrish committed Nov 30, 2016
  4. Make a clear split between application and system ResourceLoaders:-

    * System AssetManager uses the ResourceLoader from the Android runtime framework, these come from the android-all*.jars and include both
      android.R and com.android.internal.R resource IDs.
    * All other instances of AssetManager belong to the application. The application's ResourceLoader includes PackageResourceLoaders for the app and each included library. It also now includes an EmptyResourceLoader that assists in resolving Android resource identifiers that would be inlined into the APK through the android.R.class public final static int identifiers. These may not be available on earlier versions of the runtime but still require resolving.
    
    All lookups of resources must be directed to the appropriate ResourceLoader, e.g: ShadowAssetManager.getResourceLoader({ResName,int})
    
    Added ResourceIds utility class.
    
    ResourceHelper.getInternalResourceId() should use runtime framework ResourceLoader since this is where android internal resources reside.
    jongerrish committed Nov 17, 2016
  5. Keep tests sorted by API version.

    xian committed Nov 30, 2016