Text and layout improvements for the timezone customization patch (57634d60) · Commits · e / os / Browser

build/patches/Timezone-customization.patch

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -187,6 +187,13 @@ new file mode 100755
	+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"		+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
	+ app:primaryText="@string/website_settings_category_timezone_override_allowed" />		+ app:primaryText="@string/website_settings_category_timezone_override_allowed" />
	+		+
			+ <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
			+ android:id="@+id/blocked"
			+ android:layout_width="match_parent"
			+ android:layout_height="wrap_content"
			+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
			+ app:primaryText="@string/website_settings_category_timezone_override_random" />
			+
	+ <org.chromium.components.browser_ui.widget.RadioButtonWithEditText		+ <org.chromium.components.browser_ui.widget.RadioButtonWithEditText
	+ android:id="@+id/ask"		+ android:id="@+id/ask"
	+ android:layout_width="match_parent"		+ android:layout_width="match_parent"
	@@ -196,13 +203,6 @@ new file mode 100755
	+ android:hint="@string/website_settings_category_timezone_override_custom_hint"		+ android:hint="@string/website_settings_category_timezone_override_custom_hint"
	+ app:descriptionText="@string/website_settings_category_timezone_override_custom" />		+ app:descriptionText="@string/website_settings_category_timezone_override_custom" />
	+		+
	+ <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
	+ android:id="@+id/blocked"
	+ android:layout_width="match_parent"
	+ android:layout_height="wrap_content"
	+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
	+ app:primaryText="@string/website_settings_category_timezone_override_random" />
	+
	+ </org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout>		+ </org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout>
	+		+
	+ <org.chromium.ui.widget.ButtonCompat		+ <org.chromium.ui.widget.ButtonCompat
	@@ -966,16 +966,16 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen

	+ <!-- Timezone override -->		+ <!-- Timezone override -->
	+ <message name="IDS_WEBSITE_SETTINGS_TIMEOVERRIDE_INFO" desc="Primary text explaining the timezone override feature.">		+ <message name="IDS_WEBSITE_SETTINGS_TIMEOVERRIDE_INFO" desc="Primary text explaining the timezone override feature.">
	+ Override timezone with a custom or random one		+ Override timezone with a custom or random one, or use the system timezone
	+ </message>		+ </message>
	+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_ALLOWED_TEXT" desc="Primary text explaining that sites are allowed to access the system timezone.">		+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_ALLOWED_TEXT" desc="Primary text explaining that sites are allowed to access the system timezone.">
	+ System		+ None (use system timezone)
	+ </message>		+ </message>
	+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_RANDOM_TEXT" desc="Primary text for random timezone override.">		+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_RANDOM_TEXT" desc="Primary text for random timezone override.">
	+ Random		+ Random
	+ </message>		+ </message>
	+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_ALLOWED" desc="Summary text explaining that sites are allowed to access the system timezone.">		+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_ALLOWED" desc="Summary text explaining that sites are allowed to access the system timezone.">
	+ Allow sites to access the system timezone		+ System timezone
	+ </message>		+ </message>
	+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_CUSTOM" desc="Summary text explaining that sites use custom timezone.">		+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_CUSTOM" desc="Summary text explaining that sites use custom timezone.">
	+ Custom timezone		+ Custom timezone
	@@ -984,10 +984,10 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen
	+ Specify a custom timezone (default UTC)		+ Specify a custom timezone (default UTC)
	+ </message>		+ </message>
	+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_RANDOM" desc="Summary text for random timezone override.">		+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_RANDOM" desc="Summary text for random timezone override.">
	+ Use a random timezone for each tab		+ Random (for each page)
	+ </message>		+ </message>
	+ <message name="IDS_WEBSITE_SETTINGS_SELECT_BUTTON" desc="Primary button text for choosing a timezone from a list.">		+ <message name="IDS_WEBSITE_SETTINGS_SELECT_BUTTON" desc="Primary button text for choosing a timezone from a list.">
	+ Choose timezone		+ Choose Timezone...
	+ </message>		+ </message>
	+ <message name="IDS_WEBSITE_SETTINGS_SELECT_DIALOG_TITLE" desc="Text of the dialog to choose a timezone.">		+ <message name="IDS_WEBSITE_SETTINGS_SELECT_DIALOG_TITLE" desc="Text of the dialog to choose a timezone.">
	+ Choose Timezone		+ Choose Timezone