Merge branch 'mnc-mr-docs' into mnc-ub-dev

Large merge to reconnect automerger for docs branch to mainline.

Issue: 28000173
Change-Id: Ie403bcaf1c148c59be3a514613f7f1605146e66a

Author: tjohns

build/sdk.atree

@@ -330,6 +330,10 @@ developers/build/prebuilts/gradle/RuntimePermissionsBasic                    sam
 developers/build/prebuilts/gradle/ActiveNotifications                        samples/${PLATFORM_NAME}/notification/ActiveNotifications
 developers/build/prebuilts/gradle/Camera2Raw                                 samples/${PLATFORM_NAME}/media/Camera2Raw
 developers/build/prebuilts/gradle/AutoBackupForApps                          samples/${PLATFORM_NAME}/content/AutoBackupForApps
+developers/build/prebuilts/gradle/DirectShare                                samples/${PLATFORM_NAME}/content/DirectShare
+developers/build/prebuilts/gradle/MidiScope                                  samples/${PLATFORM_NAME}/media/MidiScope
+developers/build/prebuilts/gradle/MidiSynth                                  samples/${PLATFORM_NAME}/media/MidiSynth
+developers/build/prebuilts/gradle/AsymmetricFingerprintDialog                samples/${PLATFORM_NAME}/security/AsymmetricFingerprintDialog
 
 developers/build/prebuilts/androidtv                                         samples/${PLATFORM_NAME}/androidtv
 
@@ -346,12 +350,14 @@ developers/build/prebuilts/gradle/JumpingJack                   samples/${PLATFO
 developers/build/prebuilts/gradle/Notifications                 samples/${PLATFORM_NAME}/wearable/Notifications
 developers/build/prebuilts/gradle/Quiz                          samples/${PLATFORM_NAME}/wearable/Quiz
 developers/build/prebuilts/gradle/RecipeAssistant               samples/${PLATFORM_NAME}/wearable/RecipeAssistant
+developers/build/prebuilts/gradle/RuntimePermissionsWear        samples/${PLATFORM_NAME}/wearable/RuntimePermissionsWear
 developers/build/prebuilts/gradle/SkeletonWearableApp           samples/${PLATFORM_NAME}/wearable/SkeletonWearableApp
 developers/build/prebuilts/gradle/SpeedTracker                  samples/${PLATFORM_NAME}/wearable/SpeedTracker
 developers/build/prebuilts/gradle/SynchronizedNotifications     samples/${PLATFORM_NAME}/wearable/SynchronizedNotifications
 developers/build/prebuilts/gradle/Timer                         samples/${PLATFORM_NAME}/wearable/Timer
 developers/build/prebuilts/gradle/WatchFace                     samples/${PLATFORM_NAME}/wearable/WatchFace
 developers/build/prebuilts/gradle/WatchViewStub                 samples/${PLATFORM_NAME}/wearable/WatchViewStub
+developers/build/prebuilts/gradle/WearSpeakerSample             samples/${PLATFORM_NAME}/wearable/WearSpeakerSample
 developers/build/prebuilts/gradle/XYZTouristAttractions         samples/${PLATFORM_NAME}/wearable/XYZTouristAttractions
 
 # Old sample tree

samples/browseable/ActionBarCompat-Basic/res/values-v11/template-styles.xml

@@ -17,6 +17,6 @@
 <resources>
 
     <!-- Activity themes -->
-    <style name="Theme.Base" parent="@style/Theme.AppCompat.Light" />
+    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
 
 </resources>

samples/browseable/ActionBarCompat-Basic/res/values-v21/base-template-styles.xml

@@ -18,7 +18,7 @@
 <resources>
 
     <!-- Activity themes -->
-    <style name="Theme.Base" parent="@style/Theme.AppCompat.Light">
+    <style name="Theme.Base" parent="android:Theme.Material.Light">
     </style>
 
 </resources>

samples/browseable/ActionBarCompat-Basic/res/values/template-styles.xml

@@ -18,7 +18,7 @@
 
     <!-- Activity themes -->
 
-    <style name="Theme.Base" parent="@style/Theme.AppCompat.Light" />
+    <style name="Theme.Base" parent="android:Theme.Light" />
 
     <style name="Theme.Sample" parent="Theme.Base" />
 

samples/browseable/ActionBarCompat-ListPopupMenu/res/values-v11/template-styles.xml

@@ -17,6 +17,6 @@
 <resources>
 
     <!-- Activity themes -->
-    <style name="Theme.Base" parent="@style/Theme.AppCompat.Light" />
+    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
 
 </resources>

samples/browseable/ActionBarCompat-ListPopupMenu/res/values-v21/base-template-styles.xml

@@ -18,7 +18,7 @@
 <resources>
 
     <!-- Activity themes -->
-    <style name="Theme.Base" parent="@style/Theme.AppCompat.Light">
+    <style name="Theme.Base" parent="android:Theme.Material.Light">
     </style>
 
 </resources>

samples/browseable/ActionBarCompat-ListPopupMenu/res/values/template-styles.xml

@@ -18,7 +18,7 @@
 
     <!-- Activity themes -->
 
-    <style name="Theme.Base" parent="@style/Theme.AppCompat.Light" />
+    <style name="Theme.Base" parent="android:Theme.Light" />
 
     <style name="Theme.Sample" parent="Theme.Base" />
 

samples/browseable/ActionBarCompat-ShareActionProvider/res/values-v11/template-styles.xml

@@ -17,6 +17,6 @@
 <resources>
 
     <!-- Activity themes -->
-    <style name="Theme.Base" parent="@style/Theme.AppCompat.Light" />
+    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
 
 </resources>

samples/browseable/ActionBarCompat-ShareActionProvider/res/values-v21/base-template-styles.xml

@@ -18,7 +18,7 @@
 <resources>
 
     <!-- Activity themes -->
-    <style name="Theme.Base" parent="@style/Theme.AppCompat.Light">
+    <style name="Theme.Base" parent="android:Theme.Material.Light">
     </style>
 
 </resources>

samples/browseable/ActionBarCompat-ShareActionProvider/res/values/template-styles.xml

@@ -18,7 +18,7 @@
 
     <!-- Activity themes -->
 
-    <style name="Theme.Base" parent="@style/Theme.AppCompat.Light" />
+    <style name="Theme.Base" parent="android:Theme.Light" />
 
     <style name="Theme.Sample" parent="Theme.Base" />