Merge "docs: make AD logo clickable on home page" into ics-mr1
diff --git a/docs/html/design/get-started/principles.html b/docs/html/design/get-started/principles.html
index ab1fe5c..0d9ef20 100644
--- a/docs/html/design/get-started/principles.html
+++ b/docs/html/design/get-started/principles.html
@@ -148,7 +148,7 @@
<h4>Let me make it mine</h4>
<p>People love to add personal touches because it helps them feel at home and in control. Provide
-sensible, beautiful defaults, but also consider fun, optional customizations that don’t hinder
+sensible, beautiful defaults, but also consider fun, optional customizations that don't hinder
primary tasks.</p>
</div>
diff --git a/docs/html/design/static/content/principles_decide_for_me.png b/docs/html/design/static/content/principles_decide_for_me.png
index 9f4159f..2d8b883 100644
--- a/docs/html/design/static/content/principles_decide_for_me.png
+++ b/docs/html/design/static/content/principles_decide_for_me.png
Binary files differ
diff --git a/docs/html/design/static/content/principles_make_it_mine.png b/docs/html/design/static/content/principles_make_it_mine.png
index 6380277..683a0b7 100644
--- a/docs/html/design/static/content/principles_make_it_mine.png
+++ b/docs/html/design/static/content/principles_make_it_mine.png
Binary files differ
diff --git a/docs/html/design/static/default.css b/docs/html/design/static/default.css
index 20fefad..42ab527 100644
--- a/docs/html/design/static/default.css
+++ b/docs/html/design/static/default.css
@@ -279,8 +279,7 @@
background: rgba(0, 0, 0, 0.03); }
#nav #back-dac-section {
padding: 10px;
- border-top: 1px solid #ddd;
- background: transparent url(open_new_page.png) no-repeat scroll 139px 9px; }
+ border-top: 1px solid #ddd; }
#nav #back-dac-section a {
color: #333333;
font-weight: 500;
@@ -569,4 +568,4 @@
height: 12px;
margin-right: 8px; }
.video-instructions:after {
- content: 'Click or move mouse over screenshot to replay movie.'; }
+ content: 'Click to replay movie.'; }
diff --git a/docs/html/design/static/default.js b/docs/html/design/static/default.js
index 26848e6..6721ab8 100644
--- a/docs/html/design/static/default.js
+++ b/docs/html/design/static/default.js
@@ -125,7 +125,8 @@
});
// Set up play-on-hover <video> tags.
- $('video.play-on-hover').bind('mouseenter click', function(){
+ $('video.play-on-hover').bind('click', function(){
+ $(this).get(0).load(); // in case the video isn't seekable
$(this).get(0).play();
});
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java b/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
index b4b82aa..d7041fc 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
@@ -583,8 +583,7 @@
* through mHandler, this *must* be called from the UI thread.
*/
public void reportSimUnlocked() {
- mSimState = IccCard.State.READY;
- handleSimStateChange(new SimArgs(mSimState));
+ handleSimStateChange(new SimArgs(IccCard.State.READY));
}
public boolean isKeyguardBypassEnabled() {
diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java
index 72cf512..a76e70f 100644
--- a/services/java/com/android/server/connectivity/Vpn.java
+++ b/services/java/com/android/server/connectivity/Vpn.java
@@ -322,7 +322,7 @@
.setContentTitle(title)
.setContentText(text)
.setContentIntent(VpnConfig.getIntentForStatusPanel(mContext, config))
- .setDefaults(Notification.DEFAULT_ALL)
+ .setDefaults(0)
.setOngoing(true)
.getNotification();
nm.notify(R.drawable.vpn_connected, notification);
