Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c607a4d4 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by smain@google.com
Browse files

Update modal download dialogs for sdk/ndk download. 

Revise the redirect behavior once download completes.
Add more appropriate title and download message when installing SDK tools only.
Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state.
Add styles for the Studio download page.

Change-Id: Ibc4ddb4a6130ab8bd8d6044472022465829f2000
parent 0d268bea

tools/droiddoc/templates-sdk-dev/assets/css/default.css

+25 −0
Original line number Diff line number Diff line
@@ -7793,6 +7793,20 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] 
  text-align: center;

}



/* Android Studio download page */

section#features {

  padding-top:0;

}

.wrap.feature {

  margin:80px auto;

}

.dac-section-links.feature-more {

  margin-top:-20px;

}

.dac-toggle-content .wrap.feature {

  margin-top:0;

}



@media (max-width: 719px) {

  .dac-hero-figure {

    height: 150px;
@@ -7802,6 +7816,17 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] 
  .dac-hero-figure img {

    max-height: 150px;

  }



  /* Android Studio download page */

  .feature .dac-hero-figure,

  .feature .dac-hero-figure img {

    height:auto;

    max-height:none;

  }

  .feature .dac-hero-figure img {

    width:90%;

    margin:0 auto;

  }

}



.dac-hero-carousel {

tools/droiddoc/templates-sdk-dev/assets/js/docs.js

+5 −0
Original line number Diff line number Diff line
@@ -3891,6 +3891,11 @@ switch (window.getLangPref()) { 
    this.el.removeClass('dac-active');

    $('body').removeClass('dac-modal-open');

    this.isOpen = false;

    // When closing the modal for Android Studio downloads, reload the page

    // because otherwise we might get stuck with post-download dialog state

    if ($("[data-modal='studio_tos']").length) {

      location.reload();

    }

  };



  Modal.prototype.open_ = function() {

tools/droiddoc/templates-sdk-dev/sdkpage.cs

+178 −166

File changed.

Preview size limit exceeded, changes collapsed.

tools/droiddoc/templates-sdk/assets/css/default.css

+25 −0
Original line number Diff line number Diff line
@@ -7787,6 +7787,20 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] .section-card-me 
  text-align: center;

}



/* Android Studio download page */

section#features {

  padding-top:0;

}

.wrap.feature {

  margin:80px auto;

}

.dac-section-links.feature-more {

  margin-top:-20px;

}

.dac-toggle-content .wrap.feature {

  margin-top:0;

}



@media (max-width: 719px) {

  .dac-hero-figure {

    height: 150px;
@@ -7796,6 +7810,17 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] .section-card-me 
  .dac-hero-figure img {

    max-height: 150px;

  }



  /* Android Studio download page */

  .feature .dac-hero-figure,

  .feature .dac-hero-figure img {

    height:auto;

    max-height:none;

  }

  .feature .dac-hero-figure img {

    width:90%;

    margin:0 auto;

  }

}



.dac-hero-carousel {

tools/droiddoc/templates-sdk/assets/js/docs.js

+5 −0
Original line number Diff line number Diff line
@@ -4944,6 +4944,11 @@ function showSamples() { 
    this.el.removeClass('dac-active');

    $('body').removeClass('dac-modal-open');

    this.isOpen = false;

    // When closing the modal for Android Studio downloads, reload the page

    // because otherwise we might get stuck with post-download dialog state

    if ($("[data-modal='studio_tos']").length) {

      location.reload();

    }

  };



  Modal.prototype.open_ = function() {