Skip to content

Merge version-1.1.0-dev into master #510

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

Merged
merged 49 commits into from
Jan 12, 2017
Merged

Merge version-1.1.0-dev into master #510

merged 49 commits into from
Jan 12, 2017

Conversation

samtstern
Copy link
Contributor

Creating this PR in advance of QA. Will discuss all 1.1.0 release or QA issues here.

SUPERCILEX and others added 30 commits December 6, 2016 09:27
Change-Id: Ibaf6e4fc280438c2d35f3d425370143d2c4e09db
Change-Id: I98c1a7b46b312738d8fc9d8ab1e5d5a14d1f7bce
Change-Id: I5fecad0d92466b727eea47b0ec03da876652b143
Change-Id: I0fc2e3773efff571236df288c72e250cf6f06803
Change-Id: Icb240b86747841dd6ac885ce79b31a9fcf382756
Fix NPE in FacebookProvider
Refactor email flow into fragments
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@samtstern samtstern added this to the 1.1.0 milestone Jan 10, 2017
@samtstern samtstern self-assigned this Jan 10, 2017
@SUPERCILEX
Copy link
Collaborator

@samtstern Whoa!!! There were more lines of code changed in this PR than The Big Kahuna. 😄 (Also, all those red Xs on each commit because of cla stuff look so scary 😨)

PS: could you merge #511 before finalizing QA (it removes the lint hack).

Signed-off-by: Alex Saveau <[email protected]>
@SUPERCILEX
Copy link
Collaborator

@samtstern I also created #512 which fixes the broken documentation for onDataChanged.

samtstern and others added 6 commits January 11, 2017 11:07
* Update android gradle plugin

Signed-off-by: Alex Saveau <[email protected]>

* Cleanup

Signed-off-by: Alex Saveau <[email protected]>

* Better lint InvalidPackage handling

Signed-off-by: Alex Saveau <[email protected]>

* Update dependencies

Signed-off-by: Alex Saveau <[email protected]>

* Remove explicit glide dep in sample

Signed-off-by: Alex Saveau <[email protected]>

* Hmmm, I guess you can't override lint options

Signed-off-by: Alex Saveau <[email protected]>
  * The auth method picker screen looks really bad in landscape,
    put everything in a ScrollView as a temporary measure until
    we can think of some better UX

  * TestUtils did not compile, had to change some code
    and move the package

Change-Id: I84d3d974390774a7ea3c7cf5deb444b022bb7fd8
Change-Id: I1a43b8cd08672253a1a749cbb3e256da0a7621d7
@SUPERCILEX
Copy link
Collaborator

@samtstern Oh, wait I just noticed an issue.

@SUPERCILEX
Copy link
Collaborator

@samtstern Nevermind, I just noticed that the buttons in AuthMenthodPickerActivity are no longer positioned at the bottom of the layout leaving a lot of empty space. I don't think there is a way to solve that though since we are using a ScrollView.

@samtstern
Copy link
Contributor Author

@SUPERCILEX yeah that's the one behavior change ... I think it's worth it to un-break landscape (and also help on very small devices) but if you think it's bad I am open to reverting the change.

@samtstern
Copy link
Contributor Author

@puf @SUPERCILEX @mcdonamp @amandle I am going to do a merge/release at 3pm PST since I have found no issues in manual QA. Respond here if you have some objection.

@SUPERCILEX
Copy link
Collaborator

@samtstern let's merge! 😄 And yeah, we should definitely keep the scroll view to make landscape layout bearable.

Change-Id: I165c1f41bee5464cc149a5606a62a0ca36602763
Change-Id: I6d7c812fb39c484590932d3ae665d09ea959735e
@samtstern samtstern merged commit e14170d into master Jan 12, 2017
@samtstern samtstern deleted the version-1.1.0-dev branch June 15, 2017 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants