From e129d338da5ce2cb577c92dc5fd9b4bf3f20b6eb Mon Sep 17 00:00:00 2001
From: Dirk Dougherty <ddougherty@google.com>
Date: Sat, 25 Oct 2014 16:49:49 -0700
Subject: Add Nexus 6 and Nexus 9 to the device framer.

Change-Id: I7e66642429497921e20bad9065dbe5e56e952028
---
 .../galaxy_nexus/land_back.png                     | Bin 83440 -> 0 bytes
 .../galaxy_nexus/land_fore.png                     | Bin 31701 -> 0 bytes
 .../galaxy_nexus/land_shadow.png                   | Bin 43499 -> 0 bytes
 .../galaxy_nexus/port_back.png                     | Bin 71907 -> 0 bytes
 .../galaxy_nexus/port_fore.png                     | Bin 26942 -> 0 bytes
 .../galaxy_nexus/port_shadow.png                   | Bin 40335 -> 0 bytes
 .../device-art-resources/galaxy_nexus/thumb.png    | Bin 7803 -> 0 bytes
 .../device-art-resources/nexus_6/land_back.png     | Bin 0 -> 611393 bytes
 .../device-art-resources/nexus_6/land_fore.png     | Bin 0 -> 235001 bytes
 .../device-art-resources/nexus_6/land_shadow.png   | Bin 0 -> 63218 bytes
 .../device-art-resources/nexus_6/port_back.png     | Bin 0 -> 705724 bytes
 .../device-art-resources/nexus_6/port_fore.png     | Bin 0 -> 71391 bytes
 .../device-art-resources/nexus_6/port_shadow.png   | Bin 0 -> 92881 bytes
 .../promote/device-art-resources/nexus_6/thumb.png | Bin 0 -> 7883 bytes
 .../device-art-resources/nexus_9/land_back.png     | Bin 0 -> 1684450 bytes
 .../device-art-resources/nexus_9/land_fore.png     | Bin 0 -> 71727 bytes
 .../device-art-resources/nexus_9/land_shadow.png   | Bin 0 -> 65701 bytes
 .../device-art-resources/nexus_9/port_back.png     | Bin 0 -> 1719295 bytes
 .../device-art-resources/nexus_9/port_fore.png     | Bin 0 -> 64261 bytes
 .../device-art-resources/nexus_9/port_shadow.png   | Bin 0 -> 70441 bytes
 .../promote/device-art-resources/nexus_9/thumb.png | Bin 0 -> 10634 bytes
 .../device-art-resources/nexus_s/land_back.png     | Bin 113962 -> 0 bytes
 .../device-art-resources/nexus_s/land_fore.png     | Bin 20781 -> 0 bytes
 .../device-art-resources/nexus_s/land_shadow.png   | Bin 23374 -> 0 bytes
 .../device-art-resources/nexus_s/port_back.png     | Bin 107435 -> 0 bytes
 .../device-art-resources/nexus_s/port_fore.png     | Bin 16162 -> 0 bytes
 .../device-art-resources/nexus_s/port_shadow.png   | Bin 21240 -> 0 bytes
 .../promote/device-art-resources/nexus_s/thumb.png | Bin 10042 -> 0 bytes
 .../device-art-resources/xoom/land_back.png        | Bin 27199 -> 0 bytes
 .../device-art-resources/xoom/land_fore.png        | Bin 28252 -> 0 bytes
 .../device-art-resources/xoom/land_shadow.png      | Bin 26575 -> 0 bytes
 .../device-art-resources/xoom/port_back.png        | Bin 26085 -> 0 bytes
 .../device-art-resources/xoom/port_fore.png        | Bin 27070 -> 0 bytes
 .../device-art-resources/xoom/port_shadow.png      | Bin 31541 -> 0 bytes
 .../promote/device-art-resources/xoom/thumb.png    | Bin 9124 -> 0 bytes
 docs/html/distribute/tools/promote/device-art.jd   |  70 +++++++++------------
 36 files changed, 28 insertions(+), 42 deletions(-)
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_back.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_fore.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_shadow.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_back.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_fore.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_shadow.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/thumb.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_back.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_fore.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_shadow.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_back.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_fore.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_shadow.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_6/thumb.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_back.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_fore.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_shadow.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_back.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_fore.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_shadow.png
 create mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_9/thumb.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_back.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_fore.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_shadow.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_back.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_fore.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_shadow.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/nexus_s/thumb.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/xoom/land_back.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/xoom/land_fore.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/xoom/land_shadow.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/xoom/port_back.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/xoom/port_fore.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/xoom/port_shadow.png
 delete mode 100644 docs/html/distribute/tools/promote/device-art-resources/xoom/thumb.png

diff --git a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_back.png b/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_back.png
deleted file mode 100644
index f340a62..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_back.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_fore.png b/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_fore.png
deleted file mode 100644
index 2a4e595..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_fore.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_shadow.png
deleted file mode 100644
index f3a3120..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/land_shadow.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_back.png b/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_back.png
deleted file mode 100644
index c40b37c..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_back.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_fore.png b/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_fore.png
deleted file mode 100644
index aae684b..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_fore.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_shadow.png
deleted file mode 100644
index 61a0da9..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/port_shadow.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/thumb.png b/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/thumb.png
deleted file mode 100644
index e21a421..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/galaxy_nexus/thumb.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_back.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_back.png
new file mode 100644
index 0000000..06695f5
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_back.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_fore.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_fore.png
new file mode 100644
index 0000000..9fe5409
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_fore.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_shadow.png
new file mode 100644
index 0000000..99f826f
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/land_shadow.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_back.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_back.png
new file mode 100644
index 0000000..6e1aec6
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_back.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_fore.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_fore.png
new file mode 100644
index 0000000..53ec73a
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_fore.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_shadow.png
new file mode 100644
index 0000000..66149c6
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/port_shadow.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6/thumb.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/thumb.png
new file mode 100644
index 0000000..bc1f492
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6/thumb.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_back.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_back.png
new file mode 100644
index 0000000..fdbc52c
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_back.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_fore.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_fore.png
new file mode 100644
index 0000000..76fc78e
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_fore.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_shadow.png
new file mode 100644
index 0000000..d40758f
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/land_shadow.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_back.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_back.png
new file mode 100644
index 0000000..fd6f88f
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_back.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_fore.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_fore.png
new file mode 100644
index 0000000..328ceef
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_fore.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_shadow.png
new file mode 100644
index 0000000..13eba2f
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/port_shadow.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_9/thumb.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/thumb.png
new file mode 100644
index 0000000..bb52e6c
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_9/thumb.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_back.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_back.png
deleted file mode 100644
index f525e8e..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_back.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_fore.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_fore.png
deleted file mode 100644
index e26bfe1..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_fore.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_shadow.png
deleted file mode 100644
index ea26b73..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/land_shadow.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_back.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_back.png
deleted file mode 100644
index ed4ad0c..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_back.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_fore.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_fore.png
deleted file mode 100644
index 74bd077..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_fore.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_shadow.png
deleted file mode 100644
index bb4bec8..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/port_shadow.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/thumb.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_s/thumb.png
deleted file mode 100644
index 8b9a3d9..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/nexus_s/thumb.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/xoom/land_back.png b/docs/html/distribute/tools/promote/device-art-resources/xoom/land_back.png
deleted file mode 100644
index e1eb075..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/xoom/land_back.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/xoom/land_fore.png b/docs/html/distribute/tools/promote/device-art-resources/xoom/land_fore.png
deleted file mode 100644
index 15e5f50..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/xoom/land_fore.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/xoom/land_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/xoom/land_shadow.png
deleted file mode 100644
index 885508a..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/xoom/land_shadow.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/xoom/port_back.png b/docs/html/distribute/tools/promote/device-art-resources/xoom/port_back.png
deleted file mode 100644
index 290ca35..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/xoom/port_back.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/xoom/port_fore.png b/docs/html/distribute/tools/promote/device-art-resources/xoom/port_fore.png
deleted file mode 100644
index 8b3dca3..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/xoom/port_fore.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/xoom/port_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/xoom/port_shadow.png
deleted file mode 100644
index 895b75e..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/xoom/port_shadow.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/xoom/thumb.png b/docs/html/distribute/tools/promote/device-art-resources/xoom/thumb.png
deleted file mode 100644
index 8fd08a4..0000000
Binary files a/docs/html/distribute/tools/promote/device-art-resources/xoom/thumb.png and /dev/null differ
diff --git a/docs/html/distribute/tools/promote/device-art.jd b/docs/html/distribute/tools/promote/device-art.jd
index 1736060..3902b30 100644
--- a/docs/html/distribute/tools/promote/device-art.jd
+++ b/docs/html/distribute/tools/promote/device-art.jd
@@ -66,7 +66,7 @@ feature image or screenshots for your Google Play app listing.</p>
   }
 
   .device-list {
-    padding: 0;
+    padding: 1em 0 0 0;
     margin: 0;
   }
 
@@ -187,6 +187,19 @@ feature image or screenshots for your Google Play app listing.</p>
       portSize: [1080,1920],
     },
     {
+      id: 'nexus_6',
+      title: 'Nexus 6',
+      url: 'http://www.google.com/nexus/6/',
+      physicalSize: 6,
+      physicalHeight: 6.27,
+      density: '560DPI',
+      landRes: ['shadow', 'back', 'fore'],
+      landOffset: [489,327],
+      portRes: ['shadow', 'back', 'fore'],
+      portOffset: [327,489],
+      portSize: [1440, 2560],
+    },
+    {
       id: 'nexus_7',
       title: 'Nexus 7',
       url: 'http://www.google.com/nexus/7/',
@@ -201,6 +214,20 @@ feature image or screenshots for your Google Play app listing.</p>
       portSize: [800,1280]
     },
     {
+      id: 'nexus_9',
+      title: 'Nexus 9',
+      url: 'http://www.google.com/nexus/9/',
+      physicalSize: 9,
+      physicalHeight: 8.98,
+      actualResolution: [1536,2048],
+      density: 'XHDPI',
+      landRes: ['shadow', 'back', 'fore'],
+      landOffset: [514,350],
+      portRes: ['shadow', 'back', 'fore'],
+      portOffset: [348,514],
+      portSize: [1536,2048],
+    },
+    {
       id: 'nexus_10',
       title: 'Nexus 10',
       url: 'http://www.google.com/nexus/10/',
@@ -212,19 +239,6 @@ feature image or screenshots for your Google Play app listing.</p>
       landOffset: [227,217],
       portRes: ['shadow', 'back', 'fore'],
       portOffset: [217,223],
-      portSize: [800,1280]
-    },
-    {
-      id: 'xoom',
-      title: 'Motorola XOOM',
-      url: 'http://www.google.com/phone/detail/motorola-xoom',
-      physicalSize: 10,
-      physicalHeight: 6.61,
-      density: 'MDPI',
-      landRes: ['shadow', 'back', 'fore'],
-      landOffset: [218,191],
-      portRes: ['shadow', 'back', 'fore'],
-      portOffset: [199,200],
       portSize: [800,1280],
       archived: true
     },
@@ -256,34 +270,6 @@ feature image or screenshots for your Google Play app listing.</p>
       portSize: [768,1280],
       archived: true
     },
-    {
-      id: 'galaxy_nexus',
-      title: 'Galaxy Nexus',
-      url: 'http://www.android.com/devices/detail/galaxy-nexus',
-      physicalSize: 4.65,
-      physicalHeight: 5.33,
-      density: 'XHDPI',
-      landRes: ['shadow', 'back', 'fore'],
-      landOffset: [371,199],
-      portRes: ['shadow', 'back', 'fore'],
-      portOffset: [216,353],
-      portSize: [720,1280],
-      archived: true
-    },
-    {
-      id: 'nexus_s',
-      title: 'Nexus S',
-      url: 'http://www.google.com/phone/detail/nexus-s',
-      physicalSize: 4.0,
-      physicalHeight: 4.88,
-      density: 'HDPI',
-      landRes: ['shadow', 'back', 'fore'],
-      landOffset: [247,135],
-      portRes: ['shadow', 'back', 'fore'],
-      portOffset: [134,247],
-      portSize: [480,800],
-      archived: true
-    }
   ];
 
   DEVICES = DEVICES.sort(function(x, y) { return x.physicalSize - y.physicalSize; });
-- 
cgit v1.1