Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository:keepcleargas/ProgrammingAndroid2Examples
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base:master
Choose a base ref
...
head repository:bmeike/ProgrammingAndroid2Examples
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare:master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 41 files changed
  • 3 contributors

Commits on Oct 25, 2011

  1. Update README.txt

    @bmeike
    bmeike committed Oct 25, 2011
    Configuration menu
    Copy the full SHA
    7b3b2f7View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2011

  1. Correct comments and fix silly variable name

    @bmeike
    bmeike committed Nov 11, 2011
    Configuration menu
    Copy the full SHA
    a9aa728View commit details
    Browse the repository at this point in the history

  2. Update README.txt

    @bmeike
    bmeike committed Nov 11, 2011
    Configuration menu
    Copy the full SHA
    27cf2d9View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2012

  1. Deprecate this repo

    @bmeike
    bmeike committed Mar 15, 2012
    Configuration menu
    Copy the full SHA
    8c577f7View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2012

  1. Update README.txt

    @bmeike
    bmeike committed Sep 26, 2012
    Configuration menu
    Copy the full SHA
    de39ed6View commit details
    Browse the repository at this point in the history

  2. Markdown README

    @bmeike
    bmeike committed Sep 26, 2012
    Configuration menu
    Copy the full SHA
    92a8c8cView commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2013

  1. Update to 2nd edition

    @bmeike
    bmeike committed Jan 11, 2013
    Configuration menu
    Copy the full SHA
    4800c4aView commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2013

  1. Update MesgEditText.java

    Fixed for Jelly Bean, maybe ICS too :)
    @oxbits
    oxbits committed Mar 10, 2013
    Configuration menu
    Copy the full SHA
    6677b77View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2013

  1. Get rid or mesgedittext entirely - its causing bugs.

    @ldornin
    ldornin committed Apr 4, 2013
    Configuration menu
    Copy the full SHA
    8cdbaf9View commit details
    Browse the repository at this point in the history

Commits on May 14, 2013

  1. Merge the two PA example repos

    Conflicts: .gitignore 02/FillListTask/tools/ide/eclipse/classpath 02/SharedListTask/tools/ide/eclipse/classpath 03/TestApp/tools/ide/eclipse/classpath 06/AIDLDemo/tools/ide/eclipse/classpath 06/AsyncTaskDemo/tools/ide/eclipse/classpath 07/AndroidUIDemo/tools/ide/eclipse/classpath 08/SimpleFragment/default.properties 10/MicroJobs/tools/ant/build.xml 11/FinchLifecycle/default.properties 11/FinchLifecycle/proguard.cfg 11/FinchLifecycleBackport/proguard.cfg 12/FinchVideo/tools/ant/build.xml 16/SensorDemos/default.properties 16/SensorDemos/proguard.cfg 17/ClientDemo/default.properties 18/NDKDemo/default.properties AIDLDemo/project.properties AIDLDemo/tools/ide/eclipse/classpath AndroidUIDemo/project.properties AndroidUIDemo/res/layout/main.xml AndroidUIDemo/res/values/colors.xml AndroidUIDemo/src/com/oreilly/demo/android/pa/uidemo/view/DotView.java AndroidUIDemo/tools/ide/eclipse/classpath AndroidViewDemo/project.properties AsyncTaskDemo/proguard.cfg AsyncTaskDemo/tools/ant/build.xml AudioPlayer/proguard.cfg FillListTask/tools/ide/eclipse/classpath FinchChat/tools/ide/eclipse/classpath FinchFramework/project.properties FinchFramework/src/com/finchframework/finch/views/MesgEditText.java FinchLifecycle/project.properties FinchLifecycle/tools/ant/build.xml FinchLifecycle/tools/ide/eclipse/classpath FinchLifecycleBackport/proguard.cfg FinchLifecycleBackport/project.properties FinchVideo/project.properties FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/FinchVideoActivity.java NDKDemo/proguard.cfg NDKDemo/tools/ant/build.xml README.txt SearchDemo/project.properties SensorDemos/proguard.cfg SharedListTask/tools/ide/eclipse/classpath UIFramework/proguard.cfg UIFramework/project.properties
    @bmeike
    bmeike committed May 14, 2013
    Configuration menu
    Copy the full SHA
    f93c51fView commit details
    Browse the repository at this point in the history

  2. Removed some redundant linear layouts.

    Remove MesgEditText again. Remove hard coded /data path. Use File(File, "id");
    @ldornin
    ldornin committed May 14, 2013
    Configuration menu
    Copy the full SHA
    a2abc59View commit details
    Browse the repository at this point in the history

  3. Removed some redundant linear layouts.

    Remove MesgEditText again. Remove hard coded /data path. Use File(File, "id");
    @ldornin
    ldornin committed May 14, 2013
    Configuration menu
    Copy the full SHA
    3ce63e6View commit details
    Browse the repository at this point in the history

Commits on May 15, 2013

  1. Merge branch 'master' of github.com:bmeike/ProgrammingAndroid2Examples

    Conflicts: FinchFramework/project.properties FinchVideo/AndroidManifest.xml FinchVideo/project.properties FinchVideo/res/layout/video_query_activity.xml FinchVideo/res/values/strings.xml FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/FinchVideoActivity.java
    @ldornin
    ldornin committed May 15, 2013
    Configuration menu
    Copy the full SHA
    5fc19efView commit details
    Browse the repository at this point in the history

Commits on May 26, 2013

  1. Fix a few bugs. Tip of the hat to Ashok Gelal <ashokgelal@gmail.com>

    @bmeike
    bmeike committed May 26, 2013
    Configuration menu
    Copy the full SHA
    8fb3181View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2014

  1. Update README.txt

    @bmeike
    bmeike committed Aug 13, 2014
    Configuration menu
    Copy the full SHA
    ea9472dView commit details
    Browse the repository at this point in the history
Loading