blimp/client/app/android/java/res/values/arrays.xml - Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: blimp/client/app/android/java/res/values/arrays.xml

Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add v7 support jar in Blimp build.gn, to make trybot happy. Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | blimp/client/app/android/java/res/xml/blimp_preferences.xml » ('j') | blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- Copyright 2016 The Chromium Authors. All rights reserved.	2 <!-- Copyright 2016 The Chromium Authors. All rights reserved.

3 Use of this source code is governed by a BSD-style license that can be	3 Use of this source code is governed by a BSD-style license that can be

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

5	5

6 <resources>	6 <resources>

7 <string-array name="assigner_envs">	7 <string-array name="assigner_envs">
	David Trainor- moved to gerrit 2016/07/22 16:51:42 Should we remove these? Should we remove these? xingliu 2016/07/23 23:50:36 Done. And adjust v0.5 code to use the new array na Show quoted text On 2016/07/22 16:51:42, David Trainor wrote: > Should we remove these? Done. And adjust v0.5 code to use the new array name.
8 <item>Production</item>	8 <item>Production</item>

9 <item>Staging</item>	9 <item>Staging</item>

10 <item>Development</item>	10 <item>Development</item>

11 </string-array>	11 </string-array>

12 <string-array name="assigner_urls">	12 <string-array name="assigner_urls">

13 <item>https://blimp-pa.googleapis.com/v1/assignment</item>	13 <item>https://blimp-pa.googleapis.com/v1/assignment</item>

14 <item>https://staging-blimp-pa.sandbox.googleapis.com/v1/assignment</item>	14 <item>https://staging-blimp-pa.sandbox.googleapis.com/v1/assignment</item>

15 <item>https://dev-blimp-pa.sandbox.googleapis.com/v1/assignment</item>	15 <item>https://dev-blimp-pa.sandbox.googleapis.com/v1/assignment</item>

16 </string-array>	16 </string-array>

	17

	18 <!-- Blimp preferences for Chrome, all array names should prefix with blimp -- >
	David Trainor- moved to gerrit 2016/07/22 16:51:42 Add a . after blimp. Add a . after blimp. xingliu 2016/07/23 23:50:36 Done. Show quoted text On 2016/07/22 16:51:42, David Trainor wrote: > Add a . after blimp. Done.
	19 <!-- These need to port to Chrome in the future. -->
	David Trainor- moved to gerrit 2016/07/22 16:51:42 Could you explain why? If we do need to, file a b Could you explain why? If we do need to, file a bug and reference it here. xingliu 2016/07/23 23:50:35 Done. Show quoted text On 2016/07/22 16:51:42, David Trainor wrote: > Could you explain why? If we do need to, file a bug and reference it here. Done.
	20 <string-array name="blimp_assigner_envs">

	21 <item>Production</item>

	22 <item>Staging</item>

	23 <item>Development</item>

	24 </string-array>

	25 <string-array name="blimp_assigner_urls">

	26 <item>https://blimp-pa.googleapis.com/v1/assignment</item>

	27 <item>https://staging-blimp-pa.sandbox.googleapis.com/v1/assignment</item>

	28 <item>https://dev-blimp-pa.sandbox.googleapis.com/v1/assignment</item>

	29 </string-array>

17 </resources>	30 </resources>

OLD	NEW