aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-07-15[Benchmark] Edit readme to include where this is from.HEADmastermainemu-2.3-releaseemu-2.2-releaseemu-2.0-releaseemu-1.5-releaseemu-1.4-releaseXavier Ducrohet
Change-Id: I17c4e226613267da325fdc153b1dffe3f55bf0e3
2015-07-15[Benchmark] update to use benchmark gradle filesXavier Ducrohet
Change-Id: I83f5f4c45f4dbeaab1100dd0ab9ca531181914d7
2015-07-15[Benchmark] Remove files preventing running benchmarks.Xavier Ducrohet
Removing the local.prop files as well as the Wrapper. Also remove the debug keystore which is really not wanted. Change-Id: Ic5e41075f969232584eb4c150f41dfd6eb0a64eb
2015-01-30Merge pull request #121 from tjohns/ci-serverTrevor Johns
Update scripts for CI server integration
2015-01-29Update scripts for CI server integrationTrevor Johns
Update scripts/wait_for_emulator.sh to use a 60 second delay, with 10 seconds between checks. The old version only waited 3 seconds, which was not long enough for the emulator to startup. Also updated Android SDK dependencies in .travis.yml to use Google API packages.
2015-01-29Merge pull request #119 from eeVoskos/masterTrevor Johns
Fix for crashing navigation item background drawable
2015-01-15Removed erroneous selector from selected navigation item background in ↵Stratos Theodorou
pre-lollipop versions.
2015-01-07Merge pull request #110 from romannurik/masterRoman Nurik
Merge a change based on rock3r's recommendation
2015-01-07Merge branch 'master' of https://github.com/google/iosched into github-masterRoman Nurik
2015-01-07Merge branch 'Fix_PlayServices_update' of ↵Roman Nurik
https://github.com/rock3r/iosched-2014 into foo Conflicts: Wearable/build.gradle android/build.gradle build.gradle Change-Id: Ibc782be67875114498472895a527180a39b4b957
2015-01-07Merge pull request #78 from ↵Roman Nurik
alsutton/fix_feedback_sync_can_incorrectly_number_questions Use an empty ArrayList for each session being sychronsied
2015-01-07Merge pull request #96 from MaTriXy/masterRoman Nurik
Fixes issue #91 - deleteDatabase not working under Lollipop
2015-01-06Merge pull request #107 from romannurik/github-masterRoman Nurik
Import some local fixes
2015-01-06Import some local fixesRoman Nurik
Change-Id: I408707a9b5474aa40755fd041169ac8503df9817
2014-12-11Update ScheduleProvider.javaYossi Elkrief
Fix issue #91 deleteDatabase not working under Lollipop
2014-12-11Merge pull request #1 from google/masterYossi Elkrief
update repo
2014-12-08Merge pull request #90 from AjkP/masterRoman Nurik
Issue #88: Fixed comment typo
2014-12-08Merge pull request #93 from wmora/masterRoman Nurik
Gradle config update to work with AS 1.0 RC4
2014-12-08gradle plugin update to 1.0.0William Mora
2014-12-07Travis build tools updateWilliam Mora
2014-12-07gradle update to work with AS 1.0 RC4William Mora
2014-11-12Issue #88: Fixed comment typoAjkP
2014-11-07Merge pull request #74 from eyecatchup/masterTrevor Johns
Update BUILDING.md
2014-11-06Update Wear SDK tag reference in building doc (4.4W > 4.4W2).Stephan Schmitz
2014-11-06Remove obsolete reference to Wear SDK from building doc.Stephan Schmitz
2014-11-03Formatting fixAl Sutton
2014-11-03Fix google/iosched#77 - Use an empty ArrayList for each session being ↵Al Sutton
synchronised
2014-10-28Properly format text to 80 cols limit in building doc.Stephan Schmitz
2014-10-28Fix/improve building doc.Stephan Schmitz
2014-10-28Fix/improve building doc.Stephan Schmitz
2014-10-28Fix/improve building doc.Stephan Schmitz
2014-10-28Fix/improve building doc.Stephan Schmitz
2014-10-28Fix & improve building doc.Stephan Schmitz
2014-10-28Merge pull request #1 from google/masterStephan Schmitz
Merge updates from source repo.
2014-10-22Merge pull request #71 from romannurik/masterRoman Nurik
Update to v21 SwipeRefreshLayout. Also fix nav drawer BACK button bug.
2014-10-22Update to v21 SwipeRefreshLayout. Also fix nav drawer BACK button bug.Roman Nurik
Change-Id: I13a0880240c4d49b2fdca5948594567332ca8aaf
2014-10-21Merge pull request #70 from ardock/update-build-tools-rev-21.0.2Roman Nurik
Update build tools rev 21.0.2
2014-10-22Update build tools rev 21.0.2Ardock
Updated build tools to rev 21.0.2 in android build.gradle, building doc and travis.yml This rev. solves the windows users issue: https://code.google.com/p/android/issues/detail?id=77629 Travis wont work until they upgrade or you install 23.0.5 sdk manually, emulator or something i dont know do. I ll wait your/their solution. http://docs.travis-ci.com/user/languages/android/ https://github.com/travis-ci/travis-cookbooks/blob/master/ci_environment/android-sdk/CHANGELOG.md
2014-10-21Merge pull request #68 from ardock/update-travis-to-android-21Roman Nurik
Update travis.yml for lollipop
2014-10-22Update travis.yml for lollipopArdock
Updated build-tools to rev 21.0.1 Updated android component, image and target to 21
2014-10-20Merge pull request #65 from VipSaran/masterRoman Nurik
Fix for 20.0.0 build tools bug
2014-10-20Fix for 20.0.0 build tools bugVipSaran
reference: https://code.google.com/p/android/issues/detail?id=77629
2014-10-19Merge pull request #62 from romannurik/masterRoman Nurik
Fix ScrimInsets* classes to use ViewCompat.postInvalidateOnAnimation
2014-10-19Fix ScrimInsets* classes to use ViewCompat.postInvalidateOnAnimationRoman Nurik
Change-Id: I7ef8e65110fa861605f4d4f9aebb10ac775c29b8
2014-10-19Merge pull request #60 from ardock/update-buildingRoman Nurik
Remove mention of lpreview from BUILDING.md (and update build instructions)
2014-10-20Remove mention of lpreview from BUILDING.mdardock
Removed lpreview build section Updated gradle commands (removed lpreview and classic productFlavors) Updated SDK Manager packages needed (removed kiktkat, included lollipop) SDK Build-tools version 21 has solved and unsolved issues, Current rev is 21.0.1 https://code.google.com/p/android/issues/detail?id=77629 http://stackoverflow.com/questions/26446610/android-gradle-project-upgrading-build-tools-to-21-0-1-aapt-throws-exception
2014-10-18Merge pull request #1 from google/masterardock
Merge google/iosched master
2014-10-18Merge pull request #23 from minas90/masterRoman Nurik
Updated SwipeRefreshLayout.java to the latest version from Support Library 20
2014-10-18Update README.mdRoman Nurik
2014-10-18Merge pull request #53 from ogwiz2/patch-1Roman Nurik
Added periods to comments for better consistency
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 01:54:49 +0000