Improve manual proxy configuration

I think it's vital that we describe this as good as possible.

My basic ideas where:

- Keep it short
- Minimise distractions
- Highlight the most relevant phrase for each step
- Make button labels more descriptive

Would be nicer if we could use WebView and a proper list instead, but I guess this'll do for now.

[Andrey Novikov, 2013-03-07 10:26:34]

http://codereview.adblockplus.org/9643003/diff/6001/res/values/strings.xml
File res/values/strings.xml (right):

http://codereview.adblockplus.org/9643003/diff/6001/res/values/strings.xml#ne...
res/values/strings.xml:21: <string name="msg_configuration">Adblock Plus can not
change the proxy settings on your device, please configure it manually.</string>
This message is also shown on not-rooted 2.x devices, for them instructions are
not available, so it's vital to show them exact settings they have to apply.

http://codereview.adblockplus.org/9643003/diff/6001/src/org/adblockplus/andro...
File src/org/adblockplus/android/ConfigurationActivity.java (right):

http://codereview.adblockplus.org/9643003/diff/6001/src/org/adblockplus/andro...
src/org/adblockplus/android/ConfigurationActivity.java:42: String msg2 =
getString(R.string.msg_configuration);
This activity is for 2.x devices also, see my comments in strings.xml

http://codereview.adblockplus.org/9643003/diff/6001/src/org/adblockplus/andro...
File src/org/adblockplus/android/Preferences.java (right):

http://codereview.adblockplus.org/9643003/diff/6001/src/org/adblockplus/andro...
src/org/adblockplus/android/Preferences.java:446:
showConfigurationMsg(getString(R.string.msg_configuration));
This is for 2.x devices also, see my comments in strings.xml

http://codereview.adblockplus.org/9643003/diff/6001/src/org/adblockplus/andro...
src/org/adblockplus/android/Preferences.java:539:
showConfigurationMsg(getString(R.string.msg_configuration));
This is for 2.x devices also, see my comments in strings.xml

[Felix Dahlke, 2013-03-07 10:31:58]

http://codereview.adblockplus.org/9643003/diff/6001/res/values/strings.xml
File res/values/strings.xml (right):

http://codereview.adblockplus.org/9643003/diff/6001/res/values/strings.xml#ne...
res/values/strings.xml:21: <string name="msg_configuration">Adblock Plus can not
change the proxy settings on your device, please configure it manually.</string>
On 2013/03/07 10:26:34, Andrey Novikov wrote:
> This message is also shown on not-rooted 2.x devices, for them instructions
are
> not available, so it's vital to show them exact settings they have to apply.

I think we should show a different popup then, with a link to our device
specific instructions and with "Got it" instead of "Open wireless settings" on
the button.

[Andrey Novikov, 2013-03-07 10:34:53]

Agree

[Felix Dahlke, 2013-03-07 10:36:22]

On 2013/03/07 10:34:53, Andrey Novikov wrote:
> Agree

OK, I'm on it.

[Felix Dahlke, 2013-03-12 15:46:23]

I've added a separate guide for Android <= 2.3 devices.

[Felix Dahlke, 2013-03-13 04:57:50]

I'm now using more memorable port numbers, based on this:

https://intraforum.adblockplus.org/t/finding-the-most-memorable-4-5-digit-num...

With that, everything's done on my side.

[Andrey Novikov, 2013-03-13 07:51:15]

http://codereview.adblockplus.org/9643003/diff/28001/res/raw/proxysettings_ol...
File res/raw/proxysettings_old.txt (right):

http://codereview.adblockplus.org/9643003/diff/28001/res/raw/proxysettings_ol...
res/raw/proxysettings_old.txt:2: It seems like your device is running Android
2.3 or older. Many older versions of Android don't support manual proxy
configuration, and those that do have their own ways of configuring it.
It sounds very pessimistic. May be make this text more neutral? And add a link
to https://adblockplus.org/ru/android-config#proxy ?

http://codereview.adblockplus.org/9643003/diff/28001/src/org/adblockplus/andr...
File src/org/adblockplus/android/ProxyConfigurationActivity.java (right):

http://codereview.adblockplus.org/9643003/diff/28001/src/org/adblockplus/andr...
src/org/adblockplus/android/ProxyConfigurationActivity.java:5: import
android.opengl.Visibility;
What is it doing here?

http://codereview.adblockplus.org/9643003/diff/28001/src/org/adblockplus/andr...
src/org/adblockplus/android/ProxyConfigurationActivity.java:24: boolean
configurationSupported = Build.VERSION.SDK_INT >=
Build.VERSION_CODES.HONEYCOMB_MR1;
We have a static application-wide flag for this:
ProxyService.NATIVE_PROXY_SUPPORTED

http://codereview.adblockplus.org/9643003/diff/28001/src/org/adblockplus/andr...
src/org/adblockplus/android/ProxyConfigurationActivity.java:27: int
proxySettingsResource = configurationSupported ? R.raw.proxysettings :
R.raw.proxysettings_old;
I would rename it to 'proxySettingsLayout' :) (In fact I would rename it to
'layout', but you do not like short names)

[Felix Dahlke, 2013-03-13 08:48:52]

Addressed all issues.

http://codereview.adblockplus.org/9643003/diff/28001/res/raw/proxysettings_ol...
File res/raw/proxysettings_old.txt (right):

http://codereview.adblockplus.org/9643003/diff/28001/res/raw/proxysettings_ol...
res/raw/proxysettings_old.txt:2: It seems like your device is running Android
2.3 or older. Many older versions of Android don't support manual proxy
configuration, and those that do have their own ways of configuring it.
On 2013/03/13 07:51:15, Andrey Novikov wrote:
> It sounds very pessimistic. May be make this text more neutral? And add a link
> to https://adblockplus.org/ru/android-config#proxy ?

Done.

http://codereview.adblockplus.org/9643003/diff/28001/src/org/adblockplus/andr...
File src/org/adblockplus/android/ProxyConfigurationActivity.java (right):

http://codereview.adblockplus.org/9643003/diff/28001/src/org/adblockplus/andr...
src/org/adblockplus/android/ProxyConfigurationActivity.java:5: import
android.opengl.Visibility;
On 2013/03/13 07:51:15, Andrey Novikov wrote:
> What is it doing here?

WTF, missed that. I wasn't trying to sneak OpenGL in :D

http://codereview.adblockplus.org/9643003/diff/28001/src/org/adblockplus/andr...
src/org/adblockplus/android/ProxyConfigurationActivity.java:24: boolean
configurationSupported = Build.VERSION.SDK_INT >=
Build.VERSION_CODES.HONEYCOMB_MR1;
On 2013/03/13 07:51:15, Andrey Novikov wrote:
> We have a static application-wide flag for this:
> ProxyService.NATIVE_PROXY_SUPPORTED

Right, I remember lobbying for that, but couldn't find it :P

http://codereview.adblockplus.org/9643003/diff/28001/src/org/adblockplus/andr...
src/org/adblockplus/android/ProxyConfigurationActivity.java:27: int
proxySettingsResource = configurationSupported ? R.raw.proxysettings :
R.raw.proxysettings_old;
On 2013/03/13 07:51:15, Andrey Novikov wrote:
> I would rename it to 'proxySettingsLayout' :) (In fact I would rename it to
> 'layout', but you do not like short names)

Yeah, not a great name... Went with textId, seems appropriate. And I don't mind
short names :D

[Andrey Novikov, 2013-03-13 08:51:44]

It was not a layout, it was a raw file. Yes. Sorry. :)

LGTM.