From 1a075e874f8b1fa32c952b9fe66506ea5caaf0de Mon Sep 17 00:00:00 2001
From: alinasuarez <alinasuarez@google.com>
Date: Tue, 27 Jul 2021 21:00:25 +0000
Subject: [PATCH] TARE string clarification

Clarify the strings used for the TARE homepage. Update
comments so that the translators understand that TARE is not
translatable and that AlarmManager and JobScheduler are Android system
services.

Bug: 191876567

Test: Manual (open Settings > System > Developer Options > TARE and
verify tabs and menus are there)

Change-Id: I935cd0ab9e8e6e5591875a1e7f8ed9f58d8abd9c
---
 res/layout/tare_homepage.xml                  |  8 +++----
 res/values/strings.xml                        | 22 +++++++++++++------
 .../development/tare/TareHomePage.java        |  4 ++--
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/res/layout/tare_homepage.xml b/res/layout/tare_homepage.xml
index 9c218742aca..df12b7c8661 100644
--- a/res/layout/tare_homepage.xml
+++ b/res/layout/tare_homepage.xml
@@ -31,21 +31,21 @@
         android:text="On"
         android:background="?android:attr/colorBackground"/>
     <TextView
-        android:id="@+id/alarm_manager"
+        android:id="@+id/alarmmanager"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="20dp"
         android:clickable="true"
-        android:text="@string/tare_alarm_manager"
+        android:text="@string/tare_alarmmanager"
         android:textColor="?android:attr/textColorSecondary"/>
 
     <TextView
-        android:id="@+id/job_scheduler"
+        android:id="@+id/jobscheduler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="20dp"
         android:clickable="true"
-        android:text="@string/tare_job_scheduler"
+        android:text="@string/tare_jobscheduler"
         android:textColor="?android:attr/textColorSecondary"/>
 
     <View
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f790314ef80..69de0cd08e2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13612,16 +13612,24 @@
     <!-- Strings for Dialog connect button -->
     <string name="bluetooth_connect_access_dialog_positive">Connect</string>
 
-    <!-- Title for the button to edit The Android Resource Economy settings. [CHAR LIMIT=NONE] -->
+    <!-- Title for the button to edit The Android Resource Economy settings. "TARE" is the name of
+    the feature that contains the AlarmManager and JobScheduler policies which are both android
+    APIs. AlarmManager and JobScheduler are the names of Android system services and cannot be
+    translated. "TARE" is not translatable. [CHAR LIMIT=NONE] -->
     <string name="tare_title" translatable="false">TARE</string>
-    <!-- TARE settings title in developer options; TARE" is not translatable but "settings" is [CHAR LIMIT=40] -->
+    <!-- TARE settings title in developer options; "TARE" is the name of the feature and cannot be
+    translated. [CHAR LIMIT=40] -->
     <string name="tare_settings">TARE Settings</string>
     <!-- Allows user to revert the TARE settings to their default values [CHAR LIMIT=40] -->
     <string name="tare_revert">Revert to Default Settings</string>
-    <!-- Allows user to view Alarm Manager policy factors [CHAR LIMIT=40]-->
-    <string name="tare_alarm_manager">Alarm Manager</string>
-    <!-- Allows user to view Job Scheduler policy factors [CHAR LIMIT=40]-->
-    <string name="tare_job_scheduler">Job Scheduler</string>
-    <!-- Toast notifying the developer that settings were reverted to their default [CHAR LIMIT=40]-->
+    <!-- Allows user to view AlarmManager policy factors. Alarm in this context is referring to the
+    possible alarm cases in the AlarmManager policy. AlarmManager is the name of an Android system
+    service and cannot be translated. [CHAR LIMIT=40]-->
+    <string name="tare_alarmmanager" translatable="false">AlarmManager</string>
+    <!-- Allows user to view JobScheduler policy factors. JobScheduler is the name of an Android
+    system service and cannot be translated.[CHAR LIMIT=40]-->
+    <string name="tare_jobscheduler" translatable="false">JobScheduler</string>
+    <!-- Toast notifying the developer that settings were reverted to their
+    default [CHAR LIMIT=40]-->
     <string name="tare_settings_reverted_toast">Settings reverted to default.</string>
 </resources>
diff --git a/src/com/android/settings/development/tare/TareHomePage.java b/src/com/android/settings/development/tare/TareHomePage.java
index 18e84f6b7af..747b2466a29 100644
--- a/src/com/android/settings/development/tare/TareHomePage.java
+++ b/src/com/android/settings/development/tare/TareHomePage.java
@@ -42,8 +42,8 @@ public class TareHomePage extends Activity {
 
         mOnSwitch = findViewById(R.id.on_switch);
         mRevButton = findViewById(R.id.revert_button);
-        mAlarmManagerView = findViewById(R.id.alarm_manager);
-        mJobSchedulerView = findViewById(R.id.job_scheduler);
+        mAlarmManagerView = findViewById(R.id.alarmmanager);
+        mJobSchedulerView = findViewById(R.id.jobscheduler);
 
         // TODO: Set the status of the buttons based on the current status