From 3addc56d3252dc85048ea9cfc075fab9d78065a0 Mon Sep 17 00:00:00 2001
From: Amit Jain <amitnj@amazon.com>
Date: Wed, 13 Apr 2022 23:40:46 -0700
Subject: [PATCH 1/2] Refactor tv android app into platfor-app(in preperation
 to add content-app) and refactor package names and other strings.

---
 examples/tv-app/android/App/.idea/.name             |   2 +-
 examples/tv-app/android/App/.idea/gradle.xml        |   2 +-
 examples/tv-app/android/App/.idea/misc.xml          |  11 +++++++++++
 .../android/App/app/src/main/res/values/strings.xml |   3 ---
 .../android/App/{app => platform-app}/.gitignore    |   0
 .../android/App/{app => platform-app}/build.gradle  |   6 +++---
 .../App/{app => platform-app}/libs/README.md        |   0
 .../{app => platform-app}/libs/jniLibs/README.md    |   0
 .../App/{app => platform-app}/proguard-rules.pro    |   0
 .../matter/tv/server}/ExampleInstrumentedTest.java  |   4 ++--
 .../src/main/AndroidManifest.xml                    |  10 +++++-----
 .../java/com/matter/tv/server}/MainActivity.java    |   4 ++--
 .../tv/server/MatterTvServerApplication.java}       |   6 +++---
 .../main/java/com/matter/tv/server}/QRUtils.java    |   2 +-
 .../matter/tv/server}/service/MatterServant.java    |   2 +-
 .../tv/server}/service/MatterServantService.java    |   6 +++---
 .../res/drawable-v24/ic_launcher_foreground.xml     |   0
 .../main/res/drawable/ic_launcher_background.xml    |   0
 .../src/main/res/layout/activity_main.xml           |   2 +-
 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml  |   0
 .../res/mipmap-anydpi-v26/ic_launcher_round.xml     |   0
 .../src/main/res/mipmap-hdpi/ic_launcher.webp       | Bin
 .../src/main/res/mipmap-hdpi/ic_launcher_round.webp | Bin
 .../src/main/res/mipmap-mdpi/ic_launcher.webp       | Bin
 .../src/main/res/mipmap-mdpi/ic_launcher_round.webp | Bin
 .../src/main/res/mipmap-xhdpi/ic_launcher.webp      | Bin
 .../main/res/mipmap-xhdpi/ic_launcher_round.webp    | Bin
 .../src/main/res/mipmap-xxhdpi/ic_launcher.webp     | Bin
 .../main/res/mipmap-xxhdpi/ic_launcher_round.webp   | Bin
 .../src/main/res/mipmap-xxxhdpi/ic_launcher.webp    | Bin
 .../main/res/mipmap-xxxhdpi/ic_launcher_round.webp  | Bin
 .../src/main/res/values-night/themes.xml            |   2 +-
 .../src/main/res/values/colors.xml                  |   0
 .../platform-app/src/main/res/values/strings.xml    |   3 +++
 .../src/main/res/values/themes.xml                  |   2 +-
 .../java/com/matter/tv/server}/ExampleUnitTest.java |   2 +-
 examples/tv-app/android/App/settings.gradle         |   4 ++--
 scripts/build/build/targets.py                      |   2 ++
 38 files changed, 44 insertions(+), 31 deletions(-)
 delete mode 100644 examples/tv-app/android/App/app/src/main/res/values/strings.xml
 rename examples/tv-app/android/App/{app => platform-app}/.gitignore (100%)
 rename examples/tv-app/android/App/{app => platform-app}/build.gradle (90%)
 rename examples/tv-app/android/App/{app => platform-app}/libs/README.md (100%)
 rename examples/tv-app/android/App/{app => platform-app}/libs/jniLibs/README.md (100%)
 rename examples/tv-app/android/App/{app => platform-app}/proguard-rules.pro (100%)
 rename examples/tv-app/android/App/{app/src/androidTest/java/com/tcl/chip/chiptvserver => platform-app/src/androidTest/java/com/matter/tv/server}/ExampleInstrumentedTest.java (85%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/AndroidManifest.xml (81%)
 rename examples/tv-app/android/App/{app/src/main/java/com/tcl/chip/chiptvserver => platform-app/src/main/java/com/matter/tv/server}/MainActivity.java (96%)
 rename examples/tv-app/android/App/{app/src/main/java/com/tcl/chip/chiptvserver/ChipTvServerApplication.java => platform-app/src/main/java/com/matter/tv/server/MatterTvServerApplication.java} (75%)
 rename examples/tv-app/android/App/{app/src/main/java/com/tcl/chip/chiptvserver => platform-app/src/main/java/com/matter/tv/server}/QRUtils.java (95%)
 rename examples/tv-app/android/App/{app/src/main/java/com/tcl/chip/chiptvserver => platform-app/src/main/java/com/matter/tv/server}/service/MatterServant.java (99%)
 rename examples/tv-app/android/App/{app/src/main/java/com/tcl/chip/chiptvserver => platform-app/src/main/java/com/matter/tv/server}/service/MatterServantService.java (93%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/drawable/ic_launcher_background.xml (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/layout/activity_main.xml (97%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-hdpi/ic_launcher.webp (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-hdpi/ic_launcher_round.webp (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-mdpi/ic_launcher.webp (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-mdpi/ic_launcher_round.webp (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-xhdpi/ic_launcher.webp (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-xhdpi/ic_launcher_round.webp (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-xxhdpi/ic_launcher.webp (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-xxxhdpi/ic_launcher.webp (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp (100%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/values-night/themes.xml (88%)
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/values/colors.xml (100%)
 create mode 100644 examples/tv-app/android/App/platform-app/src/main/res/values/strings.xml
 rename examples/tv-app/android/App/{app => platform-app}/src/main/res/values/themes.xml (88%)
 rename examples/tv-app/android/App/{app/src/test/java/com/tcl/chip/chiptvslave => platform-app/src/test/java/com/matter/tv/server}/ExampleUnitTest.java (90%)

diff --git a/examples/tv-app/android/App/.idea/.name b/examples/tv-app/android/App/.idea/.name
index 55b67a119f278a..bd419725becb4e 100644
--- a/examples/tv-app/android/App/.idea/.name
+++ b/examples/tv-app/android/App/.idea/.name
@@ -1 +1 @@
-CHIPTVServer
\ No newline at end of file
+MatterTVAndroid
\ No newline at end of file
diff --git a/examples/tv-app/android/App/.idea/gradle.xml b/examples/tv-app/android/App/.idea/gradle.xml
index 526b4c25c6813e..86ed2c6e5bddaf 100644
--- a/examples/tv-app/android/App/.idea/gradle.xml
+++ b/examples/tv-app/android/App/.idea/gradle.xml
@@ -10,7 +10,7 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/platform-app" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/examples/tv-app/android/App/.idea/misc.xml b/examples/tv-app/android/App/.idea/misc.xml
index 2a4d5b521db9a0..17b7ab8d65b1ac 100644
--- a/examples/tv-app/android/App/.idea/misc.xml
+++ b/examples/tv-app/android/App/.idea/misc.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="../../../../../../../../Library/Android/sdk/platforms/android-30/data/res/layout/simple_list_item_1.xml" value="0.29393115942028986" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.29393115942028986" />
+        <entry key="platform-app/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />
+        <entry key="platform-app/src/main/res/layout/applist_item.xml" value="0.23697916666666666" />
+        <entry key="platform-app/src/main/res/layout/temp.xml" value="0.23697916666666666" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/examples/tv-app/android/App/app/src/main/res/values/strings.xml b/examples/tv-app/android/App/app/src/main/res/values/strings.xml
deleted file mode 100644
index a2cc2fe8dff5fe..00000000000000
--- a/examples/tv-app/android/App/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">CHIPTVServer</string>
-</resources>
\ No newline at end of file
diff --git a/examples/tv-app/android/App/app/.gitignore b/examples/tv-app/android/App/platform-app/.gitignore
similarity index 100%
rename from examples/tv-app/android/App/app/.gitignore
rename to examples/tv-app/android/App/platform-app/.gitignore
diff --git a/examples/tv-app/android/App/app/build.gradle b/examples/tv-app/android/App/platform-app/build.gradle
similarity index 90%
rename from examples/tv-app/android/App/app/build.gradle
rename to examples/tv-app/android/App/platform-app/build.gradle
index 128e1438b79bb1..8c9d066650ed5f 100644
--- a/examples/tv-app/android/App/app/build.gradle
+++ b/examples/tv-app/android/App/platform-app/build.gradle
@@ -6,7 +6,7 @@ android {
     compileSdk 30
 
     defaultConfig {
-        applicationId "com.tcl.chip.chiptvserver"
+        applicationId "com.matter.tv.server"
         minSdk 24
         targetSdk 30
         versionCode 1
@@ -39,7 +39,7 @@ android {
 
     sourceSets {
         main {
-            jniLibs.srcDirs = ['libs/jniLibs']
+            jniLibs.srcDirs = ['../app/libs/jniLibs']
 
             // uncomment this code to debug
 //            java.srcDirs = [
@@ -54,7 +54,7 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar","*.so"])
+    implementation fileTree(dir: "../app/libs", include: ["*.jar","*.so"])
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
diff --git a/examples/tv-app/android/App/app/libs/README.md b/examples/tv-app/android/App/platform-app/libs/README.md
similarity index 100%
rename from examples/tv-app/android/App/app/libs/README.md
rename to examples/tv-app/android/App/platform-app/libs/README.md
diff --git a/examples/tv-app/android/App/app/libs/jniLibs/README.md b/examples/tv-app/android/App/platform-app/libs/jniLibs/README.md
similarity index 100%
rename from examples/tv-app/android/App/app/libs/jniLibs/README.md
rename to examples/tv-app/android/App/platform-app/libs/jniLibs/README.md
diff --git a/examples/tv-app/android/App/app/proguard-rules.pro b/examples/tv-app/android/App/platform-app/proguard-rules.pro
similarity index 100%
rename from examples/tv-app/android/App/app/proguard-rules.pro
rename to examples/tv-app/android/App/platform-app/proguard-rules.pro
diff --git a/examples/tv-app/android/App/app/src/androidTest/java/com/tcl/chip/chiptvserver/ExampleInstrumentedTest.java b/examples/tv-app/android/App/platform-app/src/androidTest/java/com/matter/tv/server/ExampleInstrumentedTest.java
similarity index 85%
rename from examples/tv-app/android/App/app/src/androidTest/java/com/tcl/chip/chiptvserver/ExampleInstrumentedTest.java
rename to examples/tv-app/android/App/platform-app/src/androidTest/java/com/matter/tv/server/ExampleInstrumentedTest.java
index 9bd1c270ec6c1a..e24471c0fab77e 100644
--- a/examples/tv-app/android/App/app/src/androidTest/java/com/tcl/chip/chiptvserver/ExampleInstrumentedTest.java
+++ b/examples/tv-app/android/App/platform-app/src/androidTest/java/com/matter/tv/server/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.tcl.chip.chiptvserver;
+package com.matter.tv.server;
 
 import static org.junit.Assert.*;
 
@@ -19,6 +19,6 @@ public class ExampleInstrumentedTest {
   public void useAppContext() {
     // Context of the app under test.
     Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-    assertEquals("com.tcl.chip.chiptvslave", appContext.getPackageName());
+    assertEquals("com.matter.tv.server", appContext.getPackageName());
   }
 }
diff --git a/examples/tv-app/android/App/app/src/main/AndroidManifest.xml b/examples/tv-app/android/App/platform-app/src/main/AndroidManifest.xml
similarity index 81%
rename from examples/tv-app/android/App/app/src/main/AndroidManifest.xml
rename to examples/tv-app/android/App/platform-app/src/main/AndroidManifest.xml
index a51122c976037d..e9a3f07fed5111 100644
--- a/examples/tv-app/android/App/app/src/main/AndroidManifest.xml
+++ b/examples/tv-app/android/App/platform-app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tcl.chip.chiptvserver">
+    package="com.matter.tv.server">
 
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -19,9 +19,9 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:name=".ChipTvServerApplication"
-        android:theme="@style/Theme.CHIPTVSlave">
-        <activity android:name=".MainActivity"
+        android:name="com.matter.tv.server.MatterTvServerApplication"
+        android:theme="@style/Theme.MatterTVSlave">
+        <activity android:name="com.matter.tv.server.MainActivity"
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -29,7 +29,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <service android:name=".service.MatterServantService" />
+        <service android:name="com.matter.tv.server.service.MatterServantService" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MainActivity.java
similarity index 96%
rename from examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
rename to examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MainActivity.java
index 08816f922a5746..e16937f8248324 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MainActivity.java
@@ -1,4 +1,4 @@
-package com.tcl.chip.chiptvserver;
+package com.matter.tv.server;
 
 import android.graphics.Bitmap;
 import android.os.Bundle;
@@ -10,7 +10,7 @@
 import chip.setuppayload.DiscoveryCapability;
 import chip.setuppayload.SetupPayload;
 import chip.setuppayload.SetupPayloadParser;
-import com.tcl.chip.chiptvserver.service.MatterServant;
+import com.matter.tv.server.service.MatterServant;
 import java.util.HashSet;
 
 public class MainActivity extends AppCompatActivity {
diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/ChipTvServerApplication.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MatterTvServerApplication.java
similarity index 75%
rename from examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/ChipTvServerApplication.java
rename to examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MatterTvServerApplication.java
index 79a13d9a0cdf18..c2f15790dc225f 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/ChipTvServerApplication.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MatterTvServerApplication.java
@@ -1,11 +1,11 @@
-package com.tcl.chip.chiptvserver;
+package com.matter.tv.server;
 
 import android.app.Application;
 import android.content.Intent;
 import android.os.Build;
-import com.tcl.chip.chiptvserver.service.MatterServantService;
+import com.matter.tv.server.service.MatterServantService;
 
-public class ChipTvServerApplication extends Application {
+public class MatterTvServerApplication extends Application {
   @Override
   public void onCreate() {
     super.onCreate();
diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/QRUtils.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/QRUtils.java
similarity index 95%
rename from examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/QRUtils.java
rename to examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/QRUtils.java
index 7a408c233fd2fa..c7b05e0f14ec86 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/QRUtils.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/QRUtils.java
@@ -1,4 +1,4 @@
-package com.tcl.chip.chiptvserver;
+package com.matter.tv.server;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java
similarity index 99%
rename from examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
rename to examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java
index 8e24c3e17967f8..bf1e85019931dc 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServant.java
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-package com.tcl.chip.chiptvserver.service;
+package com.matter.tv.server.service;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServantService.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServantService.java
similarity index 93%
rename from examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServantService.java
rename to examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServantService.java
index a65ebffa505aa2..9efc03f29d2a81 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServantService.java
+++ b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServantService.java
@@ -1,4 +1,4 @@
-package com.tcl.chip.chiptvserver.service;
+package com.matter.tv.server.service;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -10,8 +10,8 @@
 import android.os.IBinder;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
-import com.tcl.chip.chiptvserver.MainActivity;
-import com.tcl.chip.chiptvserver.R;
+import com.matter.tv.server.MainActivity;
+import com.matter.tv.server.R;
 
 public class MatterServantService extends Service {
   private static final String CHANNEL_ID = "Matter";
diff --git a/examples/tv-app/android/App/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/examples/tv-app/android/App/platform-app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to examples/tv-app/android/App/platform-app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/examples/tv-app/android/App/app/src/main/res/drawable/ic_launcher_background.xml b/examples/tv-app/android/App/platform-app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/drawable/ic_launcher_background.xml
rename to examples/tv-app/android/App/platform-app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml b/examples/tv-app/android/App/platform-app/src/main/res/layout/activity_main.xml
similarity index 97%
rename from examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml
rename to examples/tv-app/android/App/platform-app/src/main/res/layout/activity_main.xml
index 32a1ab4bf46648..caa0d4e651d450 100644
--- a/examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml
+++ b/examples/tv-app/android/App/platform-app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context="com.matter.tv.server.MainActivity">
 
     <TextView
         android:id="@+id/qrCodeTxt"
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-hdpi/ic_launcher.webp
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-mdpi/ic_launcher.webp
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/examples/tv-app/android/App/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/examples/tv-app/android/App/platform-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to examples/tv-app/android/App/platform-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/examples/tv-app/android/App/app/src/main/res/values-night/themes.xml b/examples/tv-app/android/App/platform-app/src/main/res/values-night/themes.xml
similarity index 88%
rename from examples/tv-app/android/App/app/src/main/res/values-night/themes.xml
rename to examples/tv-app/android/App/platform-app/src/main/res/values-night/themes.xml
index da91ed13dc5579..a3446bf6ce426b 100644
--- a/examples/tv-app/android/App/app/src/main/res/values-night/themes.xml
+++ b/examples/tv-app/android/App/platform-app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.CHIPTVSlave" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.MatterTVSlave" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/examples/tv-app/android/App/app/src/main/res/values/colors.xml b/examples/tv-app/android/App/platform-app/src/main/res/values/colors.xml
similarity index 100%
rename from examples/tv-app/android/App/app/src/main/res/values/colors.xml
rename to examples/tv-app/android/App/platform-app/src/main/res/values/colors.xml
diff --git a/examples/tv-app/android/App/platform-app/src/main/res/values/strings.xml b/examples/tv-app/android/App/platform-app/src/main/res/values/strings.xml
new file mode 100644
index 00000000000000..5d203be00da7da
--- /dev/null
+++ b/examples/tv-app/android/App/platform-app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">MatterTVServer</string>
+</resources>
\ No newline at end of file
diff --git a/examples/tv-app/android/App/app/src/main/res/values/themes.xml b/examples/tv-app/android/App/platform-app/src/main/res/values/themes.xml
similarity index 88%
rename from examples/tv-app/android/App/app/src/main/res/values/themes.xml
rename to examples/tv-app/android/App/platform-app/src/main/res/values/themes.xml
index 3e95998b6438ba..2d74dd91024cf4 100644
--- a/examples/tv-app/android/App/app/src/main/res/values/themes.xml
+++ b/examples/tv-app/android/App/platform-app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.CHIPTVSlave" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.MatterTVSlave" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/examples/tv-app/android/App/app/src/test/java/com/tcl/chip/chiptvslave/ExampleUnitTest.java b/examples/tv-app/android/App/platform-app/src/test/java/com/matter/tv/server/ExampleUnitTest.java
similarity index 90%
rename from examples/tv-app/android/App/app/src/test/java/com/tcl/chip/chiptvslave/ExampleUnitTest.java
rename to examples/tv-app/android/App/platform-app/src/test/java/com/matter/tv/server/ExampleUnitTest.java
index 6ee6449bb56acc..bc7a9b58b3df0c 100644
--- a/examples/tv-app/android/App/app/src/test/java/com/tcl/chip/chiptvslave/ExampleUnitTest.java
+++ b/examples/tv-app/android/App/platform-app/src/test/java/com/matter/tv/server/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.tcl.chip.chiptvserver;
+package com.matter.tv.server;
 
 import static org.junit.Assert.*;
 
diff --git a/examples/tv-app/android/App/settings.gradle b/examples/tv-app/android/App/settings.gradle
index 8392989d7bc70a..9775d632e171e9 100644
--- a/examples/tv-app/android/App/settings.gradle
+++ b/examples/tv-app/android/App/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name = "CHIPTVServer"
-include ':app'
+rootProject.name = "MatterTVAndroid"
+include ':platform-app'
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index 6965bef6a303d7..c897fa09a7fac1 100644
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -418,6 +418,8 @@ def AndroidTargets():
     yield target.Extend('androidstudio-x64-chip-tool', board=AndroidBoard.AndroidStudio_X64, app=AndroidApp.CHIP_TOOL)
     yield target.Extend('arm64-chip-tvserver', board=AndroidBoard.ARM64, app=AndroidApp.CHIP_TVServer)
     yield target.Extend('arm-chip-tvserver', board=AndroidBoard.ARM, app=AndroidApp.CHIP_TVServer)
+    yield target.Extend('x86-chip-tvserver', board=AndroidBoard.X86, app=AndroidApp.CHIP_TVServer)
+    yield target.Extend('x64-chip-tvserver', board=AndroidBoard.X64, app=AndroidApp.CHIP_TVServer)
     yield target.Extend('arm64-chip-tv-casting-app', board=AndroidBoard.ARM64, app=AndroidApp.CHIP_TV_CASTING_APP)
     yield target.Extend('arm-chip-tv-casting-app', board=AndroidBoard.ARM, app=AndroidApp.CHIP_TV_CASTING_APP)
 

From 698b0529e3b21a7236e506d92b8d131cc9978a60 Mon Sep 17 00:00:00 2001
From: Amit Jain <amitnj@amazon.com>
Date: Thu, 14 Apr 2022 12:59:24 -0700
Subject: [PATCH 2/2] Modify tesdata to include the new build targets

---
 .../testdata/all_targets_except_host.txt      |  2 +
 .../build/testdata/build_all_except_host.txt  | 70 +++++++++++++++++++
 .../glob_star_targets_except_host.txt         |  2 +
 3 files changed, 74 insertions(+)

diff --git a/scripts/build/testdata/all_targets_except_host.txt b/scripts/build/testdata/all_targets_except_host.txt
index 8854f5ff7b37d0..be18277c062404 100644
--- a/scripts/build/testdata/all_targets_except_host.txt
+++ b/scripts/build/testdata/all_targets_except_host.txt
@@ -13,7 +13,9 @@ android-arm64-chip-tool
 android-arm64-chip-tv-casting-app
 android-arm64-chip-tvserver
 android-x64-chip-tool
+android-x64-chip-tvserver
 android-x86-chip-tool
+android-x86-chip-tvserver
 bl602-light
 cc13x2x7_26x2x7-all-clusters
 cc13x2x7_26x2x7-lock-ftd
diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt
index 3277a56637b8a1..d18b34a0652c60 100644
--- a/scripts/build/testdata/build_all_except_host.txt
+++ b/scripts/build/testdata/build_all_except_host.txt
@@ -160,12 +160,36 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
+# Generating android-x64-chip-tvserver
+gn gen --check --fail-on-unused-args {out}/android-x64-chip-tvserver '--args=target_os="android" target_cpu="x64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_config_network_layer_ble=false ' --root={root}/examples/tv-app/android/
+
+# Accepting NDK licenses @ tools
+bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
+
+# Generating JARs for Java build rules test
+python3 build/chip/java/tests/generate_jars_for_test.py
+
+# Setting up Android deps through Gradle
+python3 third_party/android_deps/set_up_android_deps.py
+
 # Generating android-x86-chip-tool
 gn gen --check --fail-on-unused-args {out}/android-x86-chip-tool '--args=target_os="android" target_cpu="x86" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" '
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
+# Generating JARs for Java build rules test
+python3 build/chip/java/tests/generate_jars_for_test.py
+
+# Setting up Android deps through Gradle
+python3 third_party/android_deps/set_up_android_deps.py
+
+# Generating android-x86-chip-tvserver
+gn gen --check --fail-on-unused-args {out}/android-x86-chip-tvserver '--args=target_os="android" target_cpu="x86" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_config_network_layer_ble=false ' --root={root}/examples/tv-app/android/
+
+# Accepting NDK licenses @ tools
+bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
+
 # Generating bl602-light
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/bouffalolab/bl602 '--args=bl602_board="BL-HWC-G1"' {out}/bl602-light
 
@@ -1141,6 +1165,29 @@ cp {out}/android-x64-chip-tool/lib/src/platform/android/AndroidPlatform.jar {roo
 # Building APP android-x64-chip-tool
 {root}/src/android/CHIPTool/gradlew -p {root}/src/android/CHIPTool -PmatterBuildSrcDir={out}/android-x64-chip-tool -PmatterSdkSourceBuild=false -PbuildDir={out}/android-x64-chip-tool assembleDebug
 
+# Building JNI android-x64-chip-tvserver
+ninja -C {out}/android-x64-chip-tvserver
+
+# Prepare Native libs android-x64-chip-tvserver
+mkdir -p {root}/examples/tv-app/android/App/app/libs/jniLibs/x86_64
+
+cp {out}/android-x64-chip-tvserver/lib/jni/x86_64/libSetupPayloadParser.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86_64/libSetupPayloadParser.so
+
+cp {out}/android-x64-chip-tvserver/lib/jni/x86_64/libc++_shared.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86_64/libc++_shared.so
+
+cp {out}/android-x64-chip-tvserver/lib/jni/x86_64/libTvApp.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86_64/libTvApp.so
+
+cp {out}/android-x64-chip-tvserver/lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar {root}/examples/tv-app/android/App/app/libs/SetupPayloadParser.jar
+
+cp {out}/android-x64-chip-tvserver/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar {root}/examples/tv-app/android/App/app/libs/AndroidPlatform.jar
+
+cp {out}/android-x64-chip-tvserver/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar {root}/examples/tv-app/android/App/app/libs/CHIPAppServer.jar
+
+cp {out}/android-x64-chip-tvserver/lib/TvApp.jar {root}/examples/tv-app/android/App/app/libs/TvApp.jar
+
+# Building Example android-x64-chip-tvserver
+{root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-x64-chip-tvserver -PmatterSdkSourceBuild=false -PbuildDir={out}/android-x64-chip-tvserver assembleDebug
+
 # Building JNI android-x86-chip-tool
 ninja -C {out}/android-x86-chip-tool
 
@@ -1162,6 +1209,29 @@ cp {out}/android-x86-chip-tool/lib/src/platform/android/AndroidPlatform.jar {roo
 # Building APP android-x86-chip-tool
 {root}/src/android/CHIPTool/gradlew -p {root}/src/android/CHIPTool -PmatterBuildSrcDir={out}/android-x86-chip-tool -PmatterSdkSourceBuild=false -PbuildDir={out}/android-x86-chip-tool assembleDebug
 
+# Building JNI android-x86-chip-tvserver
+ninja -C {out}/android-x86-chip-tvserver
+
+# Prepare Native libs android-x86-chip-tvserver
+mkdir -p {root}/examples/tv-app/android/App/app/libs/jniLibs/x86
+
+cp {out}/android-x86-chip-tvserver/lib/jni/x86/libSetupPayloadParser.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86/libSetupPayloadParser.so
+
+cp {out}/android-x86-chip-tvserver/lib/jni/x86/libc++_shared.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86/libc++_shared.so
+
+cp {out}/android-x86-chip-tvserver/lib/jni/x86/libTvApp.so {root}/examples/tv-app/android/App/app/libs/jniLibs/x86/libTvApp.so
+
+cp {out}/android-x86-chip-tvserver/lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar {root}/examples/tv-app/android/App/app/libs/SetupPayloadParser.jar
+
+cp {out}/android-x86-chip-tvserver/lib/third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar {root}/examples/tv-app/android/App/app/libs/AndroidPlatform.jar
+
+cp {out}/android-x86-chip-tvserver/lib/third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar {root}/examples/tv-app/android/App/app/libs/CHIPAppServer.jar
+
+cp {out}/android-x86-chip-tvserver/lib/TvApp.jar {root}/examples/tv-app/android/App/app/libs/TvApp.jar
+
+# Building Example android-x86-chip-tvserver
+{root}/examples/tv-app/android/App/gradlew -p {root}/examples/tv-app/android/App/ -PmatterBuildSrcDir={out}/android-x86-chip-tvserver -PmatterSdkSourceBuild=false -PbuildDir={out}/android-x86-chip-tvserver assembleDebug
+
 # Building bl602-light
 ninja -C {out}/bl602-light
 
diff --git a/scripts/build/testdata/glob_star_targets_except_host.txt b/scripts/build/testdata/glob_star_targets_except_host.txt
index 0ada4dfb673077..76b7f1d8776ba3 100644
--- a/scripts/build/testdata/glob_star_targets_except_host.txt
+++ b/scripts/build/testdata/glob_star_targets_except_host.txt
@@ -13,7 +13,9 @@ android-arm64-chip-tool
 android-arm64-chip-tv-casting-app
 android-arm64-chip-tvserver
 android-x64-chip-tool
+android-x64-chip-tvserver
 android-x86-chip-tool
+android-x86-chip-tvserver
 bl602-light
 cc13x2x7_26x2x7-all-clusters
 cc13x2x7_26x2x7-lock-ftd