Merge "CDD: Clarify the charging specs to refer when a USB type C port." into nougat-mr1-dev
diff --git a/3_software/3_8_user-interface-compatibility.md b/3_software/3_8_user-interface-compatibility.md
index 6fed317..89b4695 100644
--- a/3_software/3_8_user-interface-compatibility.md
+++ b/3_software/3_8_user-interface-compatibility.md
@@ -33,11 +33,6 @@
in the Android SDK documentation for details.
* Device implementations that include support for lock screen MAY support
application widgets on the lock screen.
-* SHOULD trigger the fast-switch action between the two most recently used apps,
- when the recents function key is tapped twice.
-* SHOULD trigger the split-screen multiwindow-mode, if supported, when the recents
- functions key is long pressed.
-
### 3.8.3\. Notifications
@@ -253,13 +248,17 @@
following requirements:
* MUST support at least up to 20 displayed activities.
-* SHOULD display the titles of at least 4 activities at a time.
+* SHOULD at least display the title of 4 activities at a time.
* MUST implement the [screen pinning behavior](http://developer.android.com/about/versions/android-5.0.html#ScreenPinning)
and provide the user with a settings menu to toggle the feature.
* SHOULD display highlight color, icon, screen title in recents.
* SHOULD display a closing affordance ("x") but MAY delay this until user interacts with screens.
* SHOULD implement a shortcut to switch easily to the previous activity
* MAY display affiliated recents as a group that moves together.
+* SHOULD trigger the fast-switch action between the two most recently used
+ apps, when the recents function key is tapped twice.
+* SHOULD trigger the split-screen multiwindow-mode, if supported, when the
+ recents functions key is long pressed.
Device implementations are STRONGLY RECOMMENDED to use the upstream Android user
interface (or a similar thumbnail-based interface) for the overview screen.
diff --git a/7_hardware-compatibility/7_1_display-and-graphics.md b/7_hardware-compatibility/7_1_display-and-graphics.md
index ddd0cfd..1d35633 100644
--- a/7_hardware-compatibility/7_1_display-and-graphics.md
+++ b/7_hardware-compatibility/7_1_display-and-graphics.md
@@ -69,16 +69,22 @@
#### 7.1.1.2\. Screen Aspect Ratio
-<div class="note">
+While there is no restriction to the screen aspect ratio value of the physical
+screen display, the screen aspect ratio of the surface that third-party apps
+are rendered on and which can be derived from the values reported via the
+[DisplayMetrics](https://developer.android.com/reference/android/util/DisplayMetrics.html)
+MUST meet the following requirements:
-Android Watch devices MAY have an aspect ratio of 1.0 (1:1).
-
-</div>
-
-The screen aspect ratio MUST be a value from 1.3333 (4:3) to 1.86 (roughly
-16:9), but Android Watch devices MAY have an aspect ratio of 1.0 (1:1) because
-such a device implementation will use a UI_MODE_TYPE_WATCH as the
-android.content.res.Configuration.uiMode.
+* If the [uiMode](https://developer.android.com/reference/android/content/res/Configuration.html#uiMode)
+is configured as UI_MODE_TYPE_WATCH, the aspect ratio value MAY be set as
+1.0 (1:1).
+* If the third-party app indicates that it is resizeable via the
+[android:resizeableActivity](https://developer.android.com/guide/topics/ui/multi-window.html#configuring)
+attribute, there are no restrictions to the aspect ratio value.
+* For all other cases, the aspect ratio MUST be a value between 1.3333 (4:3)
+and 1.86 (roughly 16:9) unless the app has indicated explicitly that it
+supports a higher screen aspect ratio through the [maxAspectRatio](https://developer.android.com/guide/practices/screens_support.html#MaxAspectRatio)
+metadata value.
#### 7.1.1.3\. Screen Density
diff --git a/7_hardware-compatibility/7_9_virtual-reality.md b/7_hardware-compatibility/7_9_virtual-reality.md
index f52b6ea..e19dd96 100644
--- a/7_hardware-compatibility/7_9_virtual-reality.md
+++ b/7_hardware-compatibility/7_9_virtual-reality.md
@@ -21,9 +21,9 @@
* Device implementations MUST have at least 2 physical cores.
* Device implementations MUST declare android.software.vr.mode feature.
* Device implementations MAY provide an exclusive core to the foreground
- application and MAY support the `Process.getExclusiveCores` API to return
- the numbers of the CPU cores that are exclusive to the top foreground
- application. If exclusive core is supported, then the core MUST not allow
+ application and MAY support the Process.getExclusiveCores API to return
+ the numbers of the cpu cores that are exclusive to the top foreground
+ application. If exclusive core is supported then the core MUST not allow
any other userspace processes to run on it (except device drivers used
by the application), but MAY allow some kernel processes to run as
necessary.