Module TopAppBars (#85)

* Initial changes * Move translations * Remove unused string * Update README * Fix theme(night) * Strcture the topappbars module as per old naming Co-authored-by: Aishwarya <aishwarya@DESKTOP-SBI7.redmond.corp.microsoft.com> Co-authored-by: Aishwarya <aishwarya@Sachins-MacBook-Pro.local>
2021-06-29 17:32:56 +05:30 · 2021-06-29 17:32:56 +05:30 · a39681cb0e
--- a/FluentUI.Demo/build.gradle
+++ b/FluentUI.Demo/build.gradle
@ -62,6 +62,7 @@ dependencies {
    implementation project(':fluentui_tablayout')
    implementation project(':fluentui_ccb')
    implementation project(':fluentui_transients')
+    implementation project(':fluentui_topappbars')
    implementation project(':fluentui_menus')
    implementation project(':fluentui_persona')
    implementation project(':fluentui_progress')
--- a/FluentUI/build.gradle
+++ b/FluentUI/build.gradle
@ -29,16 +29,17 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':fluentui_core')
-    implementation project(':fluentui_listitem')
-    implementation project(':fluentui_drawer')
-    implementation project(':fluentui_tablayout')
    implementation project(':fluentui_ccb')
-    implementation project(':fluentui_transients')
+    implementation project(':fluentui_core')
+    implementation project(':fluentui_drawer')
+    implementation project(':fluentui_listitem')
    implementation project(':fluentui_menus')
+    implementation project(':fluentui_others')
    implementation project(':fluentui_persona')
    implementation project(':fluentui_progress')
-    implementation project(':fluentui_others')
+    implementation project(':fluentui_tablayout')
+    implementation project(':fluentui_topappbars')
+    implementation project(':fluentui_transients')
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
    implementation "androidx.appcompat:appcompat:$appCompatVersion"
    implementation "com.google.android.material:material:$materialVersion"
--- a/README.md
+++ b/README.md
@ -193,7 +193,7 @@ The list of modules and their respective controls is as follows
 |fluentui_peoplepicker*|PeoplePickerView|
 |fluentui_persona|AvatarView, AvatarGroup View,<br>PersonaChipView, PersonaListView|
 |fluentui_progress|Linear Progress Bar, Circular Progress Bar|
-|fluentui_topappbars*|Toolbar, AppBar Layout, SearchBar|
+|fluentui_topappbars|Toolbar, AppBar Layout, SearchBar|
 |fluentui_transients|Snackbar, Tooltip|
 |fluentui_viewpager*|View Pager|

--- a/config.gradle
+++ b/config.gradle
@ -18,6 +18,7 @@ project.ext.fluentui_drawer_versionid='0.0.6'
 project.ext.fluentui_ccb_versionid='0.0.5'
 project.ext.fluentui_others_versionid='0.0.7'
 project.ext.fluentui_transients_versionid='0.0.5'
+project.ext.fluentui_topappbars_versionid='0.0.5'
 project.ext.fluentui_menus_versionid='0.0.5'
 project.ext.fluentui_persona_versionid='0.0.5'
 project.ext.fluentui_progress_versionid='0.0.5'
@ -29,6 +30,7 @@ project.ext.fluentui_drawer_version_code=6
 project.ext.fluentui_ccb_version_code=5
 project.ext.fluentui_others_version_code=7
 project.ext.fluentui_transients_version_code=5
+project.ext.fluentui_topappbars_version_code=5
 project.ext.fluentui_menus_version_code=5
 project.ext.fluentui_persona_version_code=5
 project.ext.fluentui_progress_version_code=5
--- a/fluentui_others/src/main/res/values-af/strings.xml
+++ b/fluentui_others/src/main/res/values-af/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s persoon</item>
    <item quantity="other">%s mense</item>
  </plurals>
-  <string name="searchbar_clear_search">Maak soektog skoon</string>
-  <string name="searchbar_back">Terug</string>
-  <string name="searchbar_query_hint_default">Soek</string>
  <string name="done">Klaar</string>
 </resources>
--- a/fluentui_others/src/main/res/values-am-rET/strings.xml
+++ b/fluentui_others/src/main/res/values-am-rET/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s ሰው</item>
    <item quantity="other">%s ሰዎች</item>
  </plurals>
-  <string name="searchbar_clear_search">ፍለጋን አጽዳ</string>
-  <string name="searchbar_back">ተመለስ</string>
-  <string name="searchbar_query_hint_default">ፍለጋ</string>
  <string name="done">ተከናውኗል</string>
 </resources>
--- a/fluentui_others/src/main/res/values-ar/strings.xml
+++ b/fluentui_others/src/main/res/values-ar/strings.xml
@ -91,8 +91,5 @@
    <item quantity="many">%s شخصاً</item>
    <item quantity="other">%s من الأشخاص</item>
  </plurals>
-  <string name="searchbar_clear_search">مسح البحث</string>
-  <string name="searchbar_back">رجوع</string>
-  <string name="searchbar_query_hint_default">بحث</string>
  <string name="done">تم</string>
 </resources>
--- a/fluentui_others/src/main/res/values-az-rAZ/strings.xml
+++ b/fluentui_others/src/main/res/values-az-rAZ/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s şəxs</item>
    <item quantity="other">%s nəfər</item>
  </plurals>
-  <string name="searchbar_clear_search">Axtarışı təmizləyin</string>
-  <string name="searchbar_back">Geri</string>
-  <string name="searchbar_query_hint_default">Axtarış</string>
  <string name="done">Hazırdır</string>
 </resources>
--- a/fluentui_others/src/main/res/values-b+sr+Latn/strings.xml
+++ b/fluentui_others/src/main/res/values-b+sr+Latn/strings.xml
@ -85,8 +85,5 @@
    <item quantity="few">%s ljudi</item>
    <item quantity="other">%s ljudi</item>
  </plurals>
-  <string name="searchbar_clear_search">Obriši pretragu</string>
-  <string name="searchbar_back">Nazad</string>
-  <string name="searchbar_query_hint_default">Pretraga</string>
  <string name="done">Gotovo</string>
 </resources>
--- a/fluentui_others/src/main/res/values-be/strings.xml
+++ b/fluentui_others/src/main/res/values-be/strings.xml
@ -87,8 +87,5 @@
    <item quantity="many">%s карыстальнікаў</item>
    <item quantity="other">%s карыстальнікаў</item>
  </plurals>
-  <string name="searchbar_clear_search">Ачысціць поле пошуку</string>
-  <string name="searchbar_back">Назад</string>
-  <string name="searchbar_query_hint_default">Пошук</string>
  <string name="done">Гатова</string>
 </resources>
--- a/fluentui_others/src/main/res/values-bg/strings.xml
+++ b/fluentui_others/src/main/res/values-bg/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s човек</item>
    <item quantity="other">%s души</item>
  </plurals>
-  <string name="searchbar_clear_search">Изчисти търсенето</string>
-  <string name="searchbar_back">Назад</string>
-  <string name="searchbar_query_hint_default">Търсене</string>
  <string name="done">Готово</string>
 </resources>
--- a/fluentui_others/src/main/res/values-bn-rBD/strings.xml
+++ b/fluentui_others/src/main/res/values-bn-rBD/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s জন ব্যক্তি</item>
    <item quantity="other">%s জন লোক</item>
  </plurals>
-  <string name="searchbar_clear_search">সন্ধান সাফ করুন</string>
-  <string name="searchbar_back">ফিরে যান</string>
-  <string name="searchbar_query_hint_default">সন্ধান করুন</string>
  <string name="done">সম্পন্ন</string>
 </resources>
--- a/fluentui_others/src/main/res/values-bs-rBA/strings.xml
+++ b/fluentui_others/src/main/res/values-bs-rBA/strings.xml
@ -85,8 +85,5 @@
    <item quantity="few">%s osobe</item>
    <item quantity="other">%s osobe</item>
  </plurals>
-  <string name="searchbar_clear_search">Obriši pretragu</string>
-  <string name="searchbar_back">Nazad</string>
-  <string name="searchbar_query_hint_default">Pretraga</string>
  <string name="done">Gotovo</string>
 </resources>
--- a/fluentui_others/src/main/res/values-ca/strings.xml
+++ b/fluentui_others/src/main/res/values-ca/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s persona</item>
    <item quantity="other">%s persones</item>
  </plurals>
-  <string name="searchbar_clear_search">Esborra la cerca</string>
-  <string name="searchbar_back">Enrere</string>
-  <string name="searchbar_query_hint_default">Cerca</string>
  <string name="done">Fet</string>
 </resources>
--- a/fluentui_others/src/main/res/values-cs/strings.xml
+++ b/fluentui_others/src/main/res/values-cs/strings.xml
@ -87,8 +87,5 @@
    <item quantity="many">%s lidí</item>
    <item quantity="other">%s lidí</item>
  </plurals>
-  <string name="searchbar_clear_search">Vymazat hledání</string>
-  <string name="searchbar_back">Zpět</string>
-  <string name="searchbar_query_hint_default">Hledat</string>
  <string name="done">Hotovo</string>
 </resources>
--- a/fluentui_others/src/main/res/values-da/strings.xml
+++ b/fluentui_others/src/main/res/values-da/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s person</item>
    <item quantity="other">%s personer</item>
  </plurals>
-  <string name="searchbar_clear_search">Ryd søgning</string>
-  <string name="searchbar_back">Tilbage</string>
-  <string name="searchbar_query_hint_default">Søg</string>
  <string name="done">Udført</string>
 </resources>
--- a/fluentui_others/src/main/res/values-de/strings.xml
+++ b/fluentui_others/src/main/res/values-de/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s Person</item>
    <item quantity="other">%s Personen</item>
  </plurals>
-  <string name="searchbar_clear_search">Suche löschen</string>
-  <string name="searchbar_back">Zurück</string>
-  <string name="searchbar_query_hint_default">Suchen</string>
  <string name="done">Fertig</string>
 </resources>
--- a/fluentui_others/src/main/res/values-el/strings.xml
+++ b/fluentui_others/src/main/res/values-el/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s άτομο</item>
    <item quantity="other">%s άτομα</item>
  </plurals>
-  <string name="searchbar_clear_search">Απαλοιφή αναζήτησης</string>
-  <string name="searchbar_back">Πίσω</string>
-  <string name="searchbar_query_hint_default">Αναζήτηση</string>
  <string name="done">Τέλος</string>
 </resources>
--- a/fluentui_others/src/main/res/values-en-rGB/strings.xml
+++ b/fluentui_others/src/main/res/values-en-rGB/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s person</item>
    <item quantity="other">%s people</item>
  </plurals>
-  <string name="searchbar_clear_search">Clear search</string>
-  <string name="searchbar_back">Back</string>
-  <string name="searchbar_query_hint_default">Search</string>
  <string name="done">Done</string>
 </resources>
--- a/fluentui_others/src/main/res/values-es-rMX/strings.xml
+++ b/fluentui_others/src/main/res/values-es-rMX/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s persona</item>
    <item quantity="other">%s personas</item>
  </plurals>
-  <string name="searchbar_clear_search">Borrar búsqueda</string>
-  <string name="searchbar_back">Volver</string>
-  <string name="searchbar_query_hint_default">Buscar</string>
  <string name="done">Listo</string>
 </resources>
--- a/fluentui_others/src/main/res/values-es/strings.xml
+++ b/fluentui_others/src/main/res/values-es/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s persona</item>
    <item quantity="other">%s personas</item>
  </plurals>
-  <string name="searchbar_clear_search">Borrar búsqueda</string>
-  <string name="searchbar_back">Volver</string>
-  <string name="searchbar_query_hint_default">Buscar</string>
  <string name="done">Listo</string>
 </resources>
--- a/fluentui_others/src/main/res/values-et/strings.xml
+++ b/fluentui_others/src/main/res/values-et/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s inimene</item>
    <item quantity="other">%s inimest</item>
  </plurals>
-  <string name="searchbar_clear_search">Tühjenda otsing</string>
-  <string name="searchbar_back">Tagasi</string>
-  <string name="searchbar_query_hint_default">Otsing</string>
  <string name="done">Valmis</string>
 </resources>
--- a/fluentui_others/src/main/res/values-eu/strings.xml
+++ b/fluentui_others/src/main/res/values-eu/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s pertsona</item>
    <item quantity="other">%s pertsona</item>
  </plurals>
-  <string name="searchbar_clear_search">Garbitu bilaketa</string>
-  <string name="searchbar_back">Atzera</string>
-  <string name="searchbar_query_hint_default">Bilatu</string>
  <string name="done">Eginda</string>
 </resources>
--- a/fluentui_others/src/main/res/values-fa/strings.xml
+++ b/fluentui_others/src/main/res/values-fa/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s نفر</item>
    <item quantity="other">%s نفر</item>
  </plurals>
-  <string name="searchbar_clear_search">پاک کردن جستجو</string>
-  <string name="searchbar_back">بازگشت</string>
-  <string name="searchbar_query_hint_default">جستجو</string>
  <string name="done">انجام شد</string>
 </resources>
--- a/fluentui_others/src/main/res/values-fi/strings.xml
+++ b/fluentui_others/src/main/res/values-fi/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s henkilö</item>
    <item quantity="other">%s henkilöä</item>
  </plurals>
-  <string name="searchbar_clear_search">Tyhjennä haku</string>
-  <string name="searchbar_back">Edellinen</string>
-  <string name="searchbar_query_hint_default">Hae</string>
  <string name="done">Valmis</string>
 </resources>
--- a/fluentui_others/src/main/res/values-fil-rPH/strings.xml
+++ b/fluentui_others/src/main/res/values-fil-rPH/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s tao</item>
    <item quantity="other">%s (na) tao</item>
  </plurals>
-  <string name="searchbar_clear_search">I-clear ang paghahanap</string>
-  <string name="searchbar_back">Bumalik</string>
-  <string name="searchbar_query_hint_default">Maghanap</string>
  <string name="done">Tapos na</string>
 </resources>
--- a/fluentui_others/src/main/res/values-fr-rCA/strings.xml
+++ b/fluentui_others/src/main/res/values-fr-rCA/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s personne</item>
    <item quantity="other">%s personnes</item>
  </plurals>
-  <string name="searchbar_clear_search">Effacer la recherche</string>
-  <string name="searchbar_back">Précédent</string>
-  <string name="searchbar_query_hint_default">Rechercher</string>
  <string name="done">OK</string>
 </resources>
--- a/fluentui_others/src/main/res/values-fr/strings.xml
+++ b/fluentui_others/src/main/res/values-fr/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s personne</item>
    <item quantity="other">%s personnes</item>
  </plurals>
-  <string name="searchbar_clear_search">Effacer la recherche</string>
-  <string name="searchbar_back">Précédent</string>
-  <string name="searchbar_query_hint_default">Rechercher</string>
  <string name="done">OK</string>
 </resources>
--- a/fluentui_others/src/main/res/values-gl/strings.xml
+++ b/fluentui_others/src/main/res/values-gl/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s persoa</item>
    <item quantity="other">%s persoas</item>
  </plurals>
-  <string name="searchbar_clear_search">Limpar a busca</string>
-  <string name="searchbar_back">Atrás</string>
-  <string name="searchbar_query_hint_default">Buscar</string>
  <string name="done">Feito</string>
 </resources>
--- a/fluentui_others/src/main/res/values-ha-rNG/strings.xml
+++ b/fluentui_others/src/main/res/values-ha-rNG/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">Mutum %s</item>
    <item quantity="other">Mutane %s</item>
  </plurals>
-  <string name="searchbar_clear_search">Clear search</string>
-  <string name="searchbar_back">Back</string>
-  <string name="searchbar_query_hint_default">Search</string>
  <string name="done">An gama</string>
 </resources>
--- a/fluentui_others/src/main/res/values-hi/strings.xml
+++ b/fluentui_others/src/main/res/values-hi/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s व्यक्ति</item>
    <item quantity="other">%s लोग</item>
  </plurals>
-  <string name="searchbar_clear_search">खोज साफ़ करें</string>
-  <string name="searchbar_back">वापस जाएँ</string>
-  <string name="searchbar_query_hint_default">खोजें</string>
  <string name="done">पूर्ण</string>
 </resources>
--- a/fluentui_others/src/main/res/values-hr/strings.xml
+++ b/fluentui_others/src/main/res/values-hr/strings.xml
@ -85,8 +85,5 @@
    <item quantity="few">%s osobe</item>
    <item quantity="other">%s osobe</item>
  </plurals>
-  <string name="searchbar_clear_search">Očisti pretraživanje</string>
-  <string name="searchbar_back">Natrag</string>
-  <string name="searchbar_query_hint_default">Pretraži</string>
  <string name="done">Gotovo</string>
 </resources>
--- a/fluentui_others/src/main/res/values-hu/strings.xml
+++ b/fluentui_others/src/main/res/values-hu/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s személy</item>
    <item quantity="other">%s személy</item>
  </plurals>
-  <string name="searchbar_clear_search">Találatok törlése</string>
-  <string name="searchbar_back">Vissza</string>
-  <string name="searchbar_query_hint_default">Keresés</string>
  <string name="done">Kész</string>
 </resources>
--- a/fluentui_others/src/main/res/values-in/strings.xml
+++ b/fluentui_others/src/main/res/values-in/strings.xml
@ -81,8 +81,5 @@
  <plurals name="people_picker_accessibility_text_view">
    <item quantity="other">%s orang</item>
  </plurals>
-  <string name="searchbar_clear_search">Hapus pencarian</string>
-  <string name="searchbar_back">Kembali</string>
-  <string name="searchbar_query_hint_default">Cari</string>
  <string name="done">Selesai</string>
 </resources>
--- a/fluentui_others/src/main/res/values-is/strings.xml
+++ b/fluentui_others/src/main/res/values-is/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s aðili</item>
    <item quantity="other">%s aðilar</item>
  </plurals>
-  <string name="searchbar_clear_search">Hreinsa leit</string>
-  <string name="searchbar_back">Til baka</string>
-  <string name="searchbar_query_hint_default">Leita</string>
  <string name="done">Lokið</string>
 </resources>
--- a/fluentui_others/src/main/res/values-it/strings.xml
+++ b/fluentui_others/src/main/res/values-it/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s persona</item>
    <item quantity="other">%s persone</item>
  </plurals>
-  <string name="searchbar_clear_search">Cancella ricerca</string>
-  <string name="searchbar_back">Indietro</string>
-  <string name="searchbar_query_hint_default">Cerca</string>
  <string name="done">Fatto</string>
 </resources>
--- a/fluentui_others/src/main/res/values-iw/strings.xml
+++ b/fluentui_others/src/main/res/values-iw/strings.xml
@ -87,8 +87,5 @@
    <item quantity="many">%s אנשים</item>
    <item quantity="other">%s אנשים</item>
  </plurals>
-  <string name="searchbar_clear_search">נקה חיפוש</string>
-  <string name="searchbar_back">הקודם</string>
-  <string name="searchbar_query_hint_default">חיפוש</string>
  <string name="done">בוצע</string>
 </resources>
--- a/fluentui_others/src/main/res/values-ja/strings.xml
+++ b/fluentui_others/src/main/res/values-ja/strings.xml
@ -81,8 +81,5 @@
  <plurals name="people_picker_accessibility_text_view">
    <item quantity="other">%s 人</item>
  </plurals>
-  <string name="searchbar_clear_search">検索のクリア</string>
-  <string name="searchbar_back">戻る</string>
-  <string name="searchbar_query_hint_default">検索</string>
  <string name="done">完了</string>
 </resources>
--- a/fluentui_others/src/main/res/values-kk/strings.xml
+++ b/fluentui_others/src/main/res/values-kk/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s адам</item>
    <item quantity="other">%s адам</item>
  </plurals>
-  <string name="searchbar_clear_search">Іздеу нәтижелерін тазарту</string>
-  <string name="searchbar_back">Артқа</string>
-  <string name="searchbar_query_hint_default">Іздеу</string>
  <string name="done">Дайын</string>
 </resources>
--- a/fluentui_others/src/main/res/values-km-rKH/strings.xml
+++ b/fluentui_others/src/main/res/values-km-rKH/strings.xml
@ -81,8 +81,5 @@
  <plurals name="people_picker_accessibility_text_view">
    <item quantity="other">មនុស្ស %s នាក់</item>
  </plurals>
-  <string name="searchbar_clear_search">លុបការស្វែងរក</string>
-  <string name="searchbar_back">ថយក្រោយ</string>
-  <string name="searchbar_query_hint_default">ស្វែងរក</string>
  <string name="done">រួចរាល់</string>
 </resources>
--- a/fluentui_others/src/main/res/values-kn/strings.xml
+++ b/fluentui_others/src/main/res/values-kn/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s ವ್ಯಕ್ತಿ</item>
    <item quantity="other">%s ಜನರು</item>
  </plurals>
-  <string name="searchbar_clear_search">ಶೋಧ ತೆರವುಗೊಳಿಸಿ</string>
-  <string name="searchbar_back">ಹಿಂದೆ</string>
-  <string name="searchbar_query_hint_default">ಶೋಧಿಸಿ</string>
  <string name="done">ಮುಗಿದಿದೆ</string>
 </resources>
--- a/fluentui_others/src/main/res/values-ko/strings.xml
+++ b/fluentui_others/src/main/res/values-ko/strings.xml
@ -81,8 +81,5 @@
  <plurals name="people_picker_accessibility_text_view">
    <item quantity="other">%s명</item>
  </plurals>
-  <string name="searchbar_clear_search">검색 지우기</string>
-  <string name="searchbar_back">뒤로</string>
-  <string name="searchbar_query_hint_default">검색</string>
  <string name="done">완료</string>
 </resources>
--- a/fluentui_others/src/main/res/values-lo/strings.xml
+++ b/fluentui_others/src/main/res/values-lo/strings.xml
@ -81,8 +81,5 @@
  <plurals name="people_picker_accessibility_text_view">
    <item quantity="other">%s ຄົນ</item>
  </plurals>
-  <string name="searchbar_clear_search">ລຶບລ້າງການຊອກຫາ</string>
-  <string name="searchbar_back">ກັບຄືນ</string>
-  <string name="searchbar_query_hint_default">ຊອກຫາ</string>
  <string name="done">ແລ້ວໆ</string>
 </resources>
--- a/fluentui_others/src/main/res/values-lt/strings.xml
+++ b/fluentui_others/src/main/res/values-lt/strings.xml
@ -87,8 +87,5 @@
    <item quantity="many">Žmonių: %s</item>
    <item quantity="other">Žmonių: %s</item>
  </plurals>
-  <string name="searchbar_clear_search">Valyti iešką</string>
-  <string name="searchbar_back">Atgal</string>
-  <string name="searchbar_query_hint_default">Ieška</string>
  <string name="done">Atlikta</string>
 </resources>
--- a/fluentui_others/src/main/res/values-lv/strings.xml
+++ b/fluentui_others/src/main/res/values-lv/strings.xml
@ -85,8 +85,5 @@
    <item quantity="one">%s persona</item>
    <item quantity="other">%s personas</item>
  </plurals>
-  <string name="searchbar_clear_search">Notīrīt meklēšanu</string>
-  <string name="searchbar_back">Atpakaļ</string>
-  <string name="searchbar_query_hint_default">Meklēt</string>
  <string name="done">Gatavs</string>
 </resources>
--- a/fluentui_others/src/main/res/values-mk/strings.xml
+++ b/fluentui_others/src/main/res/values-mk/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s лице</item>
    <item quantity="other">%s луѓе</item>
  </plurals>
-  <string name="searchbar_clear_search">Исчисти го пребарувањето</string>
-  <string name="searchbar_back">Назад</string>
-  <string name="searchbar_query_hint_default">Пребарај</string>
  <string name="done">Готово</string>
 </resources>
--- a/fluentui_others/src/main/res/values-ml/strings.xml
+++ b/fluentui_others/src/main/res/values-ml/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s വ്യക്തി</item>
    <item quantity="other">%s ആളുകൾ</item>
  </plurals>
-  <string name="searchbar_clear_search">തിരയൽ മായ്‌ക്കുക</string>
-  <string name="searchbar_back">പിന്നിലേക്ക്</string>
-  <string name="searchbar_query_hint_default">തിരയുക</string>
  <string name="done">ചെയ്‌തു</string>
 </resources>
--- a/fluentui_others/src/main/res/values-ms/strings.xml
+++ b/fluentui_others/src/main/res/values-ms/strings.xml
@ -81,8 +81,5 @@
  <plurals name="people_picker_accessibility_text_view">
    <item quantity="other">%s individu</item>
  </plurals>
-  <string name="searchbar_clear_search">Kosongkan carian</string>
-  <string name="searchbar_back">Ke belakang</string>
-  <string name="searchbar_query_hint_default">Cari</string>
  <string name="done">Selesai</string>
 </resources>
--- a/fluentui_others/src/main/res/values-nb-rNO/strings.xml
+++ b/fluentui_others/src/main/res/values-nb-rNO/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s person</item>
    <item quantity="other">%s personer</item>
  </plurals>
-  <string name="searchbar_clear_search">Nullstill søk</string>
-  <string name="searchbar_back">Tilbake</string>
-  <string name="searchbar_query_hint_default">Søk</string>
  <string name="done">Fullført</string>
 </resources>
--- a/fluentui_others/src/main/res/values-night/themes.xml
+++ b/fluentui_others/src/main/res/values-night/themes.xml
@ -13,10 +13,6 @@
    <style name="Theme.FluentUI" parent="Theme.FluentUI.Components">
        <!-- *** Semantic Colors *** -->

-        <!--AppBarLayout-->
-        <item name="fluentuiAppBarLayoutBackgroundColor">?attr/fluentuiBackgroundSecondaryColor</item>
-
-
        <!--Button-->
        <item name="fluentuiButtonBackgroundDisabledColor">?attr/fluentuiBackgroundPrimaryColor</item>
        <item name="fluentuiButtonBackgroundPressedColor">?attr/fluentuiColorPrimaryDarker</item>
@ -50,37 +46,6 @@
        <!--NumberPicker-->
        <item name="fluentuiNumberPickerBackgroundColor">?attr/fluentuiBackgroundSecondaryColor</item>

-        <!--Searchbar-->
-        <item name="fluentuiSearchbarBackgroundColor">?attr/fluentuiBackgroundSecondaryColor</item>
-        <item name="fluentuiSearchbarSearchViewContainerBackgroundColor">@color/fluentui_gray_700</item>
-        <item name="fluentuiSearchbarSearchViewTextColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-        <item name="fluentuiSearchbarBackButtonColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-        <item name="fluentuiSearchbarSearchViewCursorColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-
-        <!--Toolbar-->
-        <item name="fluentuiToolbarBackgroundColor">?attr/fluentuiBackgroundSecondaryColor</item>
-        <item name="fluentuiToolbarTitleTextColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-        <item name="fluentuiToolbarSubtitleTextColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-        <item name="fluentuiToolbarIconColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-
-    </style>
-
-    <style name="ThemeOverlay.FluentUI.NeutralAppBar" parent="">
-        <!--AppBarLayout-->
-        <item name="fluentuiAppBarLayoutBackgroundColor">?attr/fluentuiBackgroundSecondaryColor</item>
-
-        <!--Searchbar-->
-        <item name="fluentuiSearchbarBackgroundColor">?attr/fluentuiBackgroundSecondaryColor</item>
-        <item name="fluentuiSearchbarSearchViewContainerBackgroundColor">@color/fluentui_gray_700</item>
-        <item name="fluentuiSearchbarSearchViewTextColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-        <item name="fluentuiSearchbarBackButtonColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-        <item name="fluentuiSearchbarSearchViewCursorColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-
-        <!--Toolbar-->
-        <item name="fluentuiToolbarBackgroundColor">?attr/fluentuiBackgroundSecondaryColor</item>
-        <item name="fluentuiToolbarTitleTextColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-        <item name="fluentuiToolbarSubtitleTextColor">?attr/fluentuiForegroundOnSecondaryColor</item>
-        <item name="fluentuiToolbarIconColor">?attr/fluentuiForegroundOnSecondaryColor</item>
    </style>

 </resources>
--- a/fluentui_others/src/main/res/values-nl/strings.xml
+++ b/fluentui_others/src/main/res/values-nl/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s persoon</item>
    <item quantity="other">%s personen</item>
  </plurals>
-  <string name="searchbar_clear_search">Zoekopdracht wissen</string>
-  <string name="searchbar_back">Terug</string>
-  <string name="searchbar_query_hint_default">Zoeken</string>
  <string name="done">Gereed</string>
 </resources>
--- a/fluentui_others/src/main/res/values-nn-rNO/strings.xml
+++ b/fluentui_others/src/main/res/values-nn-rNO/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s person</item>
    <item quantity="other">%s personar</item>
  </plurals>
-  <string name="searchbar_clear_search">Fjern søk</string>
-  <string name="searchbar_back">Tilbake</string>
-  <string name="searchbar_query_hint_default">Søk</string>
  <string name="done">Ferdig</string>
 </resources>
--- a/fluentui_others/src/main/res/values-pl/strings.xml
+++ b/fluentui_others/src/main/res/values-pl/strings.xml
@ -87,8 +87,5 @@
    <item quantity="many">%s osób</item>
    <item quantity="other">%s osób</item>
  </plurals>
-  <string name="searchbar_clear_search">Wyczyść wyszukiwanie</string>
-  <string name="searchbar_back">Wstecz</string>
-  <string name="searchbar_query_hint_default">Wyszukaj</string>
  <string name="done">Gotowe</string>
 </resources>
--- a/fluentui_others/src/main/res/values-pt-rBR/strings.xml
+++ b/fluentui_others/src/main/res/values-pt-rBR/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s pessoa</item>
    <item quantity="other">%s pessoas</item>
  </plurals>
-  <string name="searchbar_clear_search">Limpar pesquisa</string>
-  <string name="searchbar_back">Voltar</string>
-  <string name="searchbar_query_hint_default">Pesquisar</string>
  <string name="done">Concluído</string>
 </resources>
--- a/fluentui_others/src/main/res/values-pt-rPT/strings.xml
+++ b/fluentui_others/src/main/res/values-pt-rPT/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s pessoa</item>
    <item quantity="other">%s pessoas</item>
  </plurals>
-  <string name="searchbar_clear_search">Limpar pesquisa</string>
-  <string name="searchbar_back">Anterior</string>
-  <string name="searchbar_query_hint_default">Procurar</string>
  <string name="done">Concluído</string>
 </resources>
--- a/fluentui_others/src/main/res/values-ro/strings.xml
+++ b/fluentui_others/src/main/res/values-ro/strings.xml
@ -85,8 +85,5 @@
    <item quantity="few">%s persoane</item>
    <item quantity="other">%s persoane</item>
  </plurals>
-  <string name="searchbar_clear_search">Goliți căutarea</string>
-  <string name="searchbar_back">Înapoi</string>
-  <string name="searchbar_query_hint_default">Căutare</string>
  <string name="done">Gata</string>
 </resources>
--- a/fluentui_others/src/main/res/values-ru/strings.xml
+++ b/fluentui_others/src/main/res/values-ru/strings.xml
@ -87,8 +87,5 @@
    <item quantity="many">%s человек</item>
    <item quantity="other">%s человек</item>
  </plurals>
-  <string name="searchbar_clear_search">Очистить поисковый запрос</string>
-  <string name="searchbar_back">Назад</string>
-  <string name="searchbar_query_hint_default">Поиск</string>
  <string name="done">Готово</string>
 </resources>
--- a/fluentui_others/src/main/res/values-sk/strings.xml
+++ b/fluentui_others/src/main/res/values-sk/strings.xml
@ -87,8 +87,5 @@
    <item quantity="many">Počet ľudí: %s</item>
    <item quantity="other">Počet ľudí: %s</item>
  </plurals>
-  <string name="searchbar_clear_search">Vymazať vyhľadávanie</string>
-  <string name="searchbar_back">Dozadu</string>
-  <string name="searchbar_query_hint_default">Hľadať</string>
  <string name="done">Hotovo</string>
 </resources>
--- a/fluentui_others/src/main/res/values-sl/strings.xml
+++ b/fluentui_others/src/main/res/values-sl/strings.xml
@ -87,8 +87,5 @@
    <item quantity="few">%s ljudi</item>
    <item quantity="other">%s ljudi</item>
  </plurals>
-  <string name="searchbar_clear_search">Počisti iskanje</string>
-  <string name="searchbar_back">Nazaj</string>
-  <string name="searchbar_query_hint_default">Iskanje</string>
  <string name="done">Dokončano</string>
 </resources>
--- a/fluentui_others/src/main/res/values-sq/strings.xml
+++ b/fluentui_others/src/main/res/values-sq/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s person</item>
    <item quantity="other">%s njerëz</item>
  </plurals>
-  <string name="searchbar_clear_search">Pastro kërkimin</string>
-  <string name="searchbar_back">Prapa</string>
-  <string name="searchbar_query_hint_default">Kërko</string>
  <string name="done">U krye</string>
 </resources>
--- a/fluentui_others/src/main/res/values-sr-rRS/strings.xml
+++ b/fluentui_others/src/main/res/values-sr-rRS/strings.xml
@ -85,8 +85,5 @@
    <item quantity="few">%s људи</item>
    <item quantity="other">%s људи</item>
  </plurals>
-  <string name="searchbar_clear_search">Обриши претрагу</string>
-  <string name="searchbar_back">Назад</string>
-  <string name="searchbar_query_hint_default">Претрага</string>
  <string name="done">Готово</string>
 </resources>
--- a/fluentui_others/src/main/res/values-sv/strings.xml
+++ b/fluentui_others/src/main/res/values-sv/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s person</item>
    <item quantity="other">%s personer</item>
  </plurals>
-  <string name="searchbar_clear_search">Rensa sökning</string>
-  <string name="searchbar_back">Tillbaka</string>
-  <string name="searchbar_query_hint_default">Sök</string>
  <string name="done">Klar</string>
 </resources>
--- a/fluentui_others/src/main/res/values-sw/strings.xml
+++ b/fluentui_others/src/main/res/values-sw/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">Mtu %s</item>
    <item quantity="other">Watu %s</item>
  </plurals>
-  <string name="searchbar_clear_search">Futa utafutaji</string>
-  <string name="searchbar_back">Nyuma</string>
-  <string name="searchbar_query_hint_default">Utafutaji</string>
  <string name="done">Imekamilika</string>
 </resources>
--- a/fluentui_others/src/main/res/values-ta/strings.xml
+++ b/fluentui_others/src/main/res/values-ta/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s நபர்</item>
    <item quantity="other">%s நபர்கள்</item>
  </plurals>
-  <string name="searchbar_clear_search">தேடலை அழிக்கும்</string>
-  <string name="searchbar_back">பின்</string>
-  <string name="searchbar_query_hint_default">தேடவும்</string>
  <string name="done">முடிந்தது</string>
 </resources>
--- a/fluentui_others/src/main/res/values-te/strings.xml
+++ b/fluentui_others/src/main/res/values-te/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s వ్యక్తి</item>
    <item quantity="other">%s మంది వ్యక్తులు</item>
  </plurals>
-  <string name="searchbar_clear_search">శోధనను క్లియర్ చేయి</string>
-  <string name="searchbar_back">వెనుకకు</string>
-  <string name="searchbar_query_hint_default">శోధన</string>
  <string name="done">పూర్తయింది</string>
 </resources>
--- a/fluentui_others/src/main/res/values-th/strings.xml
+++ b/fluentui_others/src/main/res/values-th/strings.xml
@ -81,8 +81,5 @@
  <plurals name="people_picker_accessibility_text_view">
    <item quantity="other">%s คน</item>
  </plurals>
-  <string name="searchbar_clear_search">ล้างการค้นหา</string>
-  <string name="searchbar_back">ย้อนกลับ</string>
-  <string name="searchbar_query_hint_default">ค้นหา</string>
  <string name="done">เสร็จสิ้น</string>
 </resources>
--- a/fluentui_others/src/main/res/values-tr/strings.xml
+++ b/fluentui_others/src/main/res/values-tr/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s kişi</item>
    <item quantity="other">%s kişi</item>
  </plurals>
-  <string name="searchbar_clear_search">Aramayı temizle</string>
-  <string name="searchbar_back">Geri</string>
-  <string name="searchbar_query_hint_default">Ara</string>
  <string name="done">Bitti</string>
 </resources>
--- a/fluentui_others/src/main/res/values-uk/strings.xml
+++ b/fluentui_others/src/main/res/values-uk/strings.xml
@ -87,8 +87,5 @@
    <item quantity="many">%s осіб</item>
    <item quantity="other">%s осіб</item>
  </plurals>
-  <string name="searchbar_clear_search">Очистити пошук</string>
-  <string name="searchbar_back">Назад</string>
-  <string name="searchbar_query_hint_default">Пошук</string>
  <string name="done">Готово</string>
 </resources>
--- a/fluentui_others/src/main/res/values-uz-rUZ/strings.xml
+++ b/fluentui_others/src/main/res/values-uz-rUZ/strings.xml
@ -83,8 +83,5 @@
    <item quantity="one">%s kishi</item>
    <item quantity="other">%s kishi</item>
  </plurals>
-  <string name="searchbar_clear_search">Qidiruvni tozalash</string>
-  <string name="searchbar_back">Orqaga</string>
-  <string name="searchbar_query_hint_default">Qidirish</string>
  <string name="done">Tayyor</string>
 </resources>
--- a/fluentui_others/src/main/res/values-vi/strings.xml
+++ b/fluentui_others/src/main/res/values-vi/strings.xml
@ -81,8 +81,5 @@
  <plurals name="people_picker_accessibility_text_view">
    <item quantity="other">%s người</item>
  </plurals>
-  <string name="searchbar_clear_search">Xóa tìm kiếm</string>
-  <string name="searchbar_back">Quay lại</string>
-  <string name="searchbar_query_hint_default">Tìm kiếm</string>
  <string name="done">Đã xong</string>
 </resources>
--- a/fluentui_others/src/main/res/values-zh-rCN/strings.xml
+++ b/fluentui_others/src/main/res/values-zh-rCN/strings.xml
@ -81,8 +81,5 @@
  <plurals name="people_picker_accessibility_text_view">
    <item quantity="other">%s 个人</item>
  </plurals>
-  <string name="searchbar_clear_search">清除搜索</string>
-  <string name="searchbar_back">返回</string>
-  <string name="searchbar_query_hint_default">搜索</string>
  <string name="done">完成</string>
 </resources>
--- a/fluentui_others/src/main/res/values-zh-rTW/strings.xml
+++ b/fluentui_others/src/main/res/values-zh-rTW/strings.xml
@ -81,8 +81,5 @@
  <plurals name="people_picker_accessibility_text_view">
    <item quantity="other">%s 人</item>
  </plurals>
-  <string name="searchbar_clear_search">清除搜尋</string>
-  <string name="searchbar_back">返回</string>
-  <string name="searchbar_query_hint_default">搜尋</string>
  <string name="done">完成</string>
 </resources>
--- a/fluentui_others/src/main/res/values/attrs.xml
+++ b/fluentui_others/src/main/res/values/attrs.xml
@ -8,9 +8,6 @@

    <!-- *** Semantic Colors *** -->

-    <!--AppBarLayout-->
-    <attr name="fluentuiAppBarLayoutBackgroundColor" format="reference|color"/>
-
    <!--BottomNavigation-->
    <attr name="fluentuiBottomNavigationBackgroundColor" format="reference|color"/>
    <attr name="fluentuiBottomNavigationForegroundActiveColor" format="reference|color"/>
@ -85,26 +82,9 @@
    <attr name="fluentuiPeoplePickerLabelTextColor" format="reference|color"/>
    <attr name="fluentuiPeoplePickerCountSpanTextColor" format="reference|color"/>

-    <!--Searchbar-->
-    <attr name="fluentuiSearchbarBackgroundColor" format="reference|color"/>
-    <attr name="fluentuiSearchbarSearchViewContainerBackgroundColor" format="reference|color"/>
-    <attr name="fluentuiSearchbarBackButtonColor" format="reference|color"/>
-    <attr name="fluentuiSearchbarSearchIconColor" format="reference|color"/>
-    <attr name="fluentuiSearchbarSearchViewTextColor" format="reference|color"/>
-    <attr name="fluentuiSearchbarSearchViewTextHintColor" format="reference|color"/>
-    <attr name="fluentuiSearchbarSearchViewCursorColor" format="reference|color"/>
-    <attr name="fluentuiSearchbarProgressColor" format="reference|color"/>
-    <attr name="fluentuiSearchbarCloseIconColor" format="reference|color"/>
-
    <!--Dialog TabLayout-->
    <attr name="fluentuiDialogTabTextColor" format="reference|color"/>
    <attr name="fluentuiDialogTabSelectedTextColor" format="reference|color"/>
    <attr name="fluentuiDialogTabIndicatorColor" format="reference|color"/>

-    <!--Toolbar-->
-    <attr name="fluentuiToolbarBackgroundColor" format="reference|color"/>
-    <attr name="fluentuiToolbarTitleTextColor" format="reference|color"/>
-    <attr name="fluentuiToolbarSubtitleTextColor" format="reference|color"/>
-    <attr name="fluentuiToolbarIconColor" format="reference|color"/>
-
 </resources>
--- a/fluentui_others/src/main/res/values/dimens.xml
+++ b/fluentui_others/src/main/res/values/dimens.xml
@ -9,10 +9,6 @@
    <dimen name="fluentui_action_bar_layout_height">48dp</dimen>
    <dimen name="fluentui_action_bar_layout_button_width">50dp</dimen>

-    <!--AppBarLayout-->
-    <dimen name="fluentui_app_bar_layout_elevation">0dp</dimen>
-    <dimen name="fluentui_app_bar_layout_elevation_scroll">4dp</dimen>
-
    <!--BottomNavigation-->
    <dimen name="fluentui_bottom_navigation_icon_labeled">24dp</dimen>
    <dimen name="fluentui_bottom_navigation_icon_unlabeled">28dp</dimen>
@ -73,30 +69,4 @@
    <dimen name="fluentui_people_picker_label_margin_end">8dp</dimen>
    <dimen name="fluentui_people_picker_vertical_padding">12dp</dimen>

-    <!--Searchbar-->
-    <dimen name="fluentui_searchbar_padding_bottom">3dp</dimen>
-    <dimen name="fluentui_searchbar_search_view_container_margin_vertical">8dp</dimen>
-    <dimen name="fluentui_searchbar_search_view_container_margin_end">16dp</dimen>
-    <dimen name="fluentui_searchbar_search_view_container_search_icon_margin_start">16dp</dimen>
-    <dimen name="fluentui_searchbar_search_view_container_back_button_margin_start">12dp</dimen>
-    <dimen name="fluentui_searchbar_search_view_container_with_icons_margin_end">4dp</dimen>
-    <dimen name="fluentui_searchbar_search_view_container_corner_radius">6dp</dimen>
-    <dimen name="fluentui_searchbar_search_view_height">34dp</dimen>
-    <dimen name="fluentui_searchbar_search_view_text_size">16sp</dimen>
-    <dimen name="fluentui_searchbar_search_view_margin_start">12dp</dimen>
-    <dimen name="fluentui_searchbar_search_view_action_view_margin_start">0dp</dimen>
-    <dimen name="fluentui_searchbar_search_icon_padding_start">16dp</dimen>
-    <dimen name="fluentui_searchbar_search_icon_padding_end">8dp</dimen>
-    <dimen name="fluentui_searchbar_with_search_icon_search_view_text_padding_start">8dp</dimen>
-    <!--This 1dp padding difference helps make room for the cursor and keep the hint aligned between focus states.-->
-    <dimen name="fluentui_searchbar_with_back_button_search_view_text_padding_start">7dp</dimen>
-    <dimen name="fluentui_searchbar_progress_size">28dp</dimen>
-
-    <!--Toolbar-->
-    <dimen name="fluentui_toolbar_navigation_icon_container_size">@dimen/fluentui_min_touch_size</dimen>
-    <dimen name="fluentui_toolbar_padding_start">16dp</dimen>
-    <dimen name="fluentui_toolbar_padding_start_with_avatar">8dp</dimen>
-    <dimen name="fluentui_toolbar_title_margin_start">0dp</dimen>
-    <dimen name="fluentui_toolbar_title_margin_start_with_avatar">16dp</dimen>
-
 </resources>
--- a/fluentui_others/src/main/res/values/integers.xml
+++ b/fluentui_others/src/main/res/values/integers.xml
@ -5,14 +5,9 @@
  -->

 <resources>
-    <!--AppBarLayout-->
-    <integer name="fluentui_app_bar_layout_elevation_duration">500</integer>
-    <integer name="fluentui_app_bar_layout_elevation_scroll_duration">0</integer>
-
-    <!--NumberPicker-->
+     <!--NumberPicker-->
    <integer name="fluentui_number_picker_selector_wheel_item_count" type="integer">7</integer>

-
    <!--PeoplePicker-->
    <integer name="fluentui_people_picker_search_directory_max_lines">2</integer>

--- a/fluentui_others/src/main/res/values/strings.xml
+++ b/fluentui_others/src/main/res/values/strings.xml
@ -175,21 +175,6 @@
    <!--Describes the action used to select calendar item-->
    <string name="calendar_adapter_accessibility_item_selected">selected</string>

-    <!-- *** Searchbar *** -->
-
-    <!--Content description for the button that clears the query text entered in the search field.-->
-    <string name="searchbar_clear_search">Clear search</string>
-    <!--Content description for the button that navigates out of the search experience back to a previous state.-->
-    <string name="searchbar_back">Back</string>
-    <!--Hint for the search field.-->
-    <string name="searchbar_query_hint_default">Search</string>
-
-
-
-    <!--Announcement when SearchBar is cleared-->
-    <string name="searchbar_accessibility_cleared_announcement">edit field cleared</string>
-
-
    <!-- *** ActionBar *** -->

    <!--Content description for default left action in the action bar layout.-->
--- a/fluentui_others/src/main/res/values/styles.xml
+++ b/fluentui_others/src/main/res/values/styles.xml
@ -110,32 +110,4 @@
        <item name="android:paddingRight">@dimen/fluentui_date_time_picker_padding_right</item>
    </style>

-    <!--Searchbar-->
-    <style name="Widget.FluentUI.SearchView" parent="Widget.AppCompat.SearchView">
-        <item name="colorControlActivated">?attr/fluentuiSearchbarSearchViewCursorColor</item>
-        <item name="android:textColorHint">?attr/fluentuiSearchbarSearchViewTextHintColor</item>
-        <item name="android:editTextColor">?attr/fluentuiSearchbarSearchViewTextColor</item>
-        <item name="android:textSize">@dimen/fluentui_searchbar_search_view_text_size</item>
-    </style>
-    <style name="Widget.FluentUI.CircularProgress.XSmall.Search">
-        <item name="android:indeterminateTint">?attr/fluentuiSearchbarProgressColor</item>
-        <item name="android:indeterminateTintMode">src_in</item>
-        <item name="android:minHeight">@dimen/fluentui_searchbar_progress_size</item>
-        <item name="android:minWidth">@dimen/fluentui_searchbar_progress_size</item>
-        <item name="android:maxHeight">@dimen/fluentui_searchbar_progress_size</item>
-        <item name="android:maxWidth">@dimen/fluentui_searchbar_progress_size</item>
-    </style>
-    <!--Toolbar-->
-    <!--We use Widget.AppCompat.Toolbar instead of a ThemeOverlay to maintain Android's default Toolbar styling.-->
-    <style name="Base.Widget.FluentUI.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
-        <item name="android:background">?attr/fluentuiToolbarBackgroundColor</item>
-        <item name="titleTextAppearance">@style/TextAppearance.FluentUI.ToolbarTitle</item>
-        <item name="subtitleTextAppearance">@style/TextAppearance.FluentUI.ToolbarSubtitle</item>
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-    </style>
-    <style name="Widget.FluentUI.Toolbar" parent="@style/Base.Widget.FluentUI.Toolbar" />
-    <style name="Widget.FluentUI.Toolbar.OverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">?attr/fluentuiToolbarIconColor</item>
-    </style>
-
 </resources>
--- a/fluentui_others/src/main/res/values/styles_font.xml
+++ b/fluentui_others/src/main/res/values/styles_font.xml
@ -64,12 +64,4 @@
        <item name="android:textAllCaps">true</item>
    </style>

-      <!--Toolbar-->
-    <style name="TextAppearance.FluentUI.ToolbarTitle" parent="TextAppearance.FluentUI.Title1">
-        <item name="android:textColor">?attr/fluentuiToolbarTitleTextColor</item>
-    </style>
-    <style name="TextAppearance.FluentUI.ToolbarSubtitle" parent="TextAppearance.FluentUI.Caption">
-        <item name="android:textColor">?attr/fluentuiToolbarSubtitleTextColor</item>
-    </style>
-
 </resources>
--- a/fluentui_others/src/main/res/values/themes.xml
+++ b/fluentui_others/src/main/res/values/themes.xml
@ -12,16 +12,11 @@
    -->
    <style name="Theme.FluentUI.Components" parent="Base.Theme.FluentUI">
        <item name="buttonStyle">@style/Widget.FluentUI.Button</item>
-        <item name="toolbarStyle">@style/Widget.FluentUI.Toolbar</item>
-        <item name="actionOverflowButtonStyle">@style/Widget.FluentUI.Toolbar.OverflowButtonStyle</item>
        <item name="homeAsUpIndicator">@drawable/ms_ic_arrow_left_24_filled_toolbar</item>
        <item name="checkboxStyle">@style/Widget.FluentUI.CheckBox</item>
        <item name="radioButtonStyle">@style/Widget.FluentUI.RadioButton</item>
        <!-- *** Semantic Colors *** -->

-        <!--AppBarLayout-->
-        <item name="fluentuiAppBarLayoutBackgroundColor">?attr/colorPrimary</item>
-
        <!--BottomNavigation-->
        <item name="fluentuiBottomNavigationBackgroundColor">?attr/fluentuiBackgroundColor</item>
        <item name="fluentuiBottomNavigationForegroundActiveColor">?attr/colorPrimary</item>
@ -98,29 +93,12 @@
        <item name="fluentuiPeoplePickerLabelTextColor">?attr/fluentuiForegroundSecondaryColor</item>
        <item name="fluentuiPeoplePickerCountSpanTextColor">?attr/fluentuiForegroundSecondaryColor</item>

-        <!--Searchbar-->
-        <item name="fluentuiSearchbarBackgroundColor">?attr/fluentuiBackgroundPrimaryColor</item>
-        <item name="fluentuiSearchbarSearchViewContainerBackgroundColor">?attr/fluentuiBackgroundSecondary20Color</item>
-        <item name="fluentuiSearchbarBackButtonColor">?attr/fluentuiForegroundOnPrimaryColor</item>
-        <item name="fluentuiSearchbarSearchIconColor">?attr/fluentuiForegroundOnPrimary80Color</item>
-        <item name="fluentuiSearchbarSearchViewTextColor">?attr/fluentuiForegroundOnPrimaryColor</item>
-        <item name="fluentuiSearchbarSearchViewTextHintColor">?attr/fluentuiForegroundOnPrimary80Color</item>
-        <item name="fluentuiSearchbarSearchViewCursorColor">?attr/fluentuiForegroundOnPrimaryColor</item>
-        <item name="fluentuiSearchbarProgressColor">?attr/fluentuiForegroundOnPrimary70Color</item>
-        <item name="fluentuiSearchbarCloseIconColor">?attr/fluentuiForegroundOnPrimary70Color</item>
-
-        <!--TabLayout Dialog-->
+       <!--TabLayout Dialog-->
        <item name="fluentuiDialogTabTextColor">?attr/fluentuiForegroundSecondaryColor</item>
        <item name="fluentuiDialogTabSelectedTextColor">?attr/fluentuiForegroundSelectedColor</item>
        <item name="fluentuiDialogTabIndicatorColor">?attr/fluentuiForegroundSelectedColor</item>

-        <!--Toolbar-->
-        <item name="fluentuiToolbarBackgroundColor">?attr/colorPrimary</item>
-        <item name="fluentuiToolbarTitleTextColor">?attr/fluentuiForegroundOnPrimaryColor</item>
-        <item name="fluentuiToolbarSubtitleTextColor">?attr/fluentuiForegroundOnPrimaryColor</item>
-        <item name="fluentuiToolbarIconColor">?attr/fluentuiForegroundOnPrimaryColor</item>
-
-    </style>
+         </style>

    <!--
        All light theme semantic colors should be defined in the base theme as the default.
@ -128,30 +106,4 @@
    -->
    <style name="Theme.FluentUI" parent="Theme.FluentUI.Components"/>

-    <!--
-        This theme overlay targets only the attributes needed for a neutral AppBarLayout with a white background.
-        Use as the theme attribute in an AppBarLayout or in a ContextThemeWrapper for AppBarLayout, Searchbar, or Toolbar.
-    -->
-    <style name="ThemeOverlay.FluentUI.NeutralAppBar" parent="">
-        <!--AppBarLayout-->
-        <item name="fluentuiAppBarLayoutBackgroundColor">?attr/fluentuiBackgroundColor</item>
-
-        <!--Searchbar-->
-        <item name="fluentuiSearchbarBackgroundColor">?attr/fluentuiBackgroundColor</item>
-        <item name="fluentuiSearchbarSearchViewContainerBackgroundColor">#33C8C8C8</item>
-        <item name="fluentuiSearchbarBackButtonColor">?attr/fluentuiForegroundSecondaryIconColor</item>
-        <item name="fluentuiSearchbarSearchIconColor">?attr/fluentuiForegroundSecondaryIconColor</item>
-        <item name="fluentuiSearchbarSearchViewTextColor">?attr/fluentuiForegroundColor</item>
-        <item name="fluentuiSearchbarSearchViewTextHintColor">?attr/fluentuiForegroundColor</item>
-        <item name="fluentuiSearchbarSearchViewCursorColor">?attr/colorPrimary</item>
-        <item name="fluentuiSearchbarProgressColor">?attr/fluentuiForegroundSecondaryIconColor</item>
-        <item name="fluentuiSearchbarCloseIconColor">?attr/fluentuiForegroundSecondaryIconColor</item>
-
-        <!--Toolbar-->
-        <item name="fluentuiToolbarBackgroundColor">?attr/fluentuiBackgroundColor</item>
-        <item name="fluentuiToolbarTitleTextColor">?attr/fluentuiForegroundColor</item>
-        <item name="fluentuiToolbarSubtitleTextColor">?attr/fluentuiForegroundColor</item>
-        <item name="fluentuiToolbarIconColor">@color/fluentui_gray_500</item>
-    </style>
-
 </resources>
--- a/fluentui_topappbars/build.gradle
+++ b/fluentui_topappbars/build.gradle
@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+apply from: '../config.gradle'
+apply from: '../publish.gradle'
+
+android {
+    compileSdkVersion constants.compileSdkVersion
+    buildFeatures {
+        viewBinding true
+    }
+
+    defaultConfig {
+        minSdkVersion constants.minSdkVersion
+        targetSdkVersion constants.targetSdkVersion
+        versionCode project.ext.fluentui_topappbars_version_code
+        versionName project.ext.fluentui_topappbars_versionid
+
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':fluentui_core')
+    implementation project(':fluentui_persona')
+    implementation project(':fluentui_progress')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "com.google.android.material:material:$materialVersion"
+    androidTestImplementation "androidx.test.ext:junit:$extJunitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
+}
+
+task sourceJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier "sources"
+}
+
+project.afterEvaluate {
+    project.ext.publishingFunc('fluentui_topappbars')
+}
--- a/fluentui_topappbars/consumer-rules.pro
+++ b/fluentui_topappbars/consumer-rules.pro
--- a/fluentui_topappbars/proguard-rules.pro
+++ b/fluentui_topappbars/proguard-rules.pro
@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/fluentui_topappbars/src/main/AndroidManifest.xml
+++ b/fluentui_topappbars/src/main/AndroidManifest.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.microsoft.fluentui.topappbars">
+
+</manifest>
--- a/fluentui_topappbars/src/main/java/com/microsoft/fluentui/appbarlayout/AppBarLayout.kt
+++ b/fluentui_topappbars/src/main/java/com/microsoft/fluentui/appbarlayout/AppBarLayout.kt
@ -18,7 +18,7 @@ import androidx.recyclerview.widget.RecyclerView
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
-import com.microsoft.fluentui.R
+import com.microsoft.fluentui.topappbars.R
 import com.microsoft.fluentui.appbarlayout.AppBarLayout.ScrollBehavior
 import com.microsoft.fluentui.search.Searchbar
 import com.microsoft.fluentui.theming.FluentUIContextThemeWrapper
@ -121,7 +121,7 @@ class AppBarLayout : AppBarLayout {
        }
    }

-    constructor(appContext: Context, attrs: AttributeSet?) : super(FluentUIContextThemeWrapper(appContext,R.style.Theme_FluentUI_Components), attrs) {
+    constructor(appContext: Context, attrs: AttributeSet?) : super(FluentUIContextThemeWrapper(appContext,R.style.Theme_FluentUI_TopAppBars), attrs) {
        setupToolbar(context)
        setBackgroundColor(ThemeUtil.getThemeAttrColor(context, R.attr.fluentuiAppBarLayoutBackgroundColor))

--- a/fluentui_topappbars/src/main/java/com/microsoft/fluentui/search/Searchbar.kt
+++ b/fluentui_topappbars/src/main/java/com/microsoft/fluentui/search/Searchbar.kt
@ -17,7 +17,7 @@ import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
-import com.microsoft.fluentui.R
+import com.microsoft.fluentui.topappbars.R
 import com.microsoft.fluentui.appbarlayout.AppBarLayout
 import com.microsoft.fluentui.theming.FluentUIContextThemeWrapper
 import com.microsoft.fluentui.util.DuoSupportUtils
@ -105,7 +105,7 @@ open class Searchbar : TemplateView, SearchView.OnQueryTextListener {
    var onCloseListener: SearchView.OnCloseListener? = null

    @JvmOverloads
-    constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : super(FluentUIContextThemeWrapper(context, R.style.Theme_FluentUI_Components), attrs, defStyleAttr)
+    constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : super(FluentUIContextThemeWrapper(context, R.style.Theme_FluentUI_TopAppBars), attrs, defStyleAttr)

    /**
     * Sets the query text for the search view.
--- a/fluentui_topappbars/src/main/java/com/microsoft/fluentui/toolbar/Toolbar.kt
+++ b/fluentui_topappbars/src/main/java/com/microsoft/fluentui/toolbar/Toolbar.kt
@ -14,7 +14,7 @@ import androidx.appcompat.widget.Toolbar
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
-import com.microsoft.fluentui.R
+import com.microsoft.fluentui.topappbars.R
 import com.microsoft.fluentui.persona.AvatarSize
 import com.microsoft.fluentui.persona.AvatarView
 import com.microsoft.fluentui.persona.IAvatar
@ -41,7 +41,7 @@ class Toolbar : Toolbar {
        }

    @JvmOverloads
-    constructor(appContext: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : super(FluentUIContextThemeWrapper(appContext,R.style.Theme_FluentUI_Components), attrs, R.attr.toolbarStyle) {
+    constructor(appContext: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : super(FluentUIContextThemeWrapper(appContext,R.style.Theme_FluentUI_TopAppBars), attrs, R.attr.toolbarStyle) {
        // minHeight can't be set in theme or it will also set title height. Having minHeight helps center option menu icons.
        val styledAttributes = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.actionBarSize))
        val actionBarSize = styledAttributes.getDimensionPixelSize(0, -1)
--- a/fluentui_topappbars/src/main/res/animator/app_bar_layout_elevation.xml
+++ b/fluentui_topappbars/src/main/res/animator/app_bar_layout_elevation.xml
--- a/fluentui_topappbars/src/main/res/animator/app_bar_layout_elevation_scroll.xml
+++ b/fluentui_topappbars/src/main/res/animator/app_bar_layout_elevation_scroll.xml
--- a/fluentui_topappbars/src/main/res/drawable/search_view_container_background.xml
+++ b/fluentui_topappbars/src/main/res/drawable/search_view_container_background.xml
--- a/fluentui_topappbars/src/main/res/layout/view_searchbar.xml
+++ b/fluentui_topappbars/src/main/res/layout/view_searchbar.xml
--- a/fluentui_topappbars/src/main/res/values-af/strings.xml
+++ b/fluentui_topappbars/src/main/res/values-af/strings.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchbar_clear_search">Maak soektog skoon</string>
+  <string name="searchbar_back">Terug</string>
+  <string name="searchbar_query_hint_default">Soek</string>
+</resources>
--- a/fluentui_topappbars/src/main/res/values-am-rET/strings.xml
+++ b/fluentui_topappbars/src/main/res/values-am-rET/strings.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchbar_clear_search">ፍለጋን አጽዳ</string>
+  <string name="searchbar_back">ተመለስ</string>
+  <string name="searchbar_query_hint_default">ፍለጋ</string>
+</resources>
--- a/fluentui_topappbars/src/main/res/values-ar/strings.xml
+++ b/fluentui_topappbars/src/main/res/values-ar/strings.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchbar_clear_search">مسح البحث</string>
+  <string name="searchbar_back">رجوع</string>
+  <string name="searchbar_query_hint_default">بحث</string>
+</resources>
--- a/fluentui_topappbars/src/main/res/values-az-rAZ/strings.xml
+++ b/fluentui_topappbars/src/main/res/values-az-rAZ/strings.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchbar_clear_search">Axtarışı təmizləyin</string>
+  <string name="searchbar_back">Geri</string>
+  <string name="searchbar_query_hint_default">Axtarış</string>
+</resources>
--- a/fluentui_topappbars/src/main/res/values-b+sr+Latn/strings.xml
+++ b/fluentui_topappbars/src/main/res/values-b+sr+Latn/strings.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchbar_clear_search">Obriši pretragu</string>
+  <string name="searchbar_back">Nazad</string>
+  <string name="searchbar_query_hint_default">Pretraga</string>
+</resources>
--- a/fluentui_topappbars/src/main/res/values-be/strings.xml
+++ b/fluentui_topappbars/src/main/res/values-be/strings.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchbar_clear_search">Ачысціць поле пошуку</string>
+  <string name="searchbar_back">Назад</string>
+  <string name="searchbar_query_hint_default">Пошук</string>
+</resources>
--- a/fluentui_topappbars/src/main/res/values-bg/strings.xml
+++ b/fluentui_topappbars/src/main/res/values-bg/strings.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchbar_clear_search">Изчисти търсенето</string>
+  <string name="searchbar_back">Назад</string>
+  <string name="searchbar_query_hint_default">Търсене</string>
+</resources>
--- a/fluentui_topappbars/src/main/res/values-bn-rBD/strings.xml
+++ b/fluentui_topappbars/src/main/res/values-bn-rBD/strings.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchbar_clear_search">সন্ধান সাফ করুন</string>
+  <string name="searchbar_back">ফিরে যান</string>
+  <string name="searchbar_query_hint_default">সন্ধান করুন</string>
+</resources>
--- a/fluentui_topappbars/src/main/res/values-bs-rBA/strings.xml
+++ b/fluentui_topappbars/src/main/res/values-bs-rBA/strings.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchbar_clear_search">Obriši pretragu</string>
+  <string name="searchbar_back">Nazad</string>
+  <string name="searchbar_query_hint_default">Pretraga</string>
+</resources>
--- a/fluentui_topappbars/src/main/res/values-ca/strings.xml
+++ b/fluentui_topappbars/src/main/res/values-ca/strings.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="searchbar_clear_search">Esborra la cerca</string>
+  <string name="searchbar_back">Enrere</string>
+  <string name="searchbar_query_hint_default">Cerca</string>
+</resources>
--- a/Показать больше
+++ b/Показать больше