FIx up analytics results by normalizing the version by stripping the device info, which is redundant.

Change-Id: If4fc97c28fff6a82206a5491c256b05444da1a34
Merge Navigation Bar and Pie Controls button config (2/2)

Based on the commit series for pie controls, this commit
makes the Navigation Bar and Pie Controls share the same
button layout.
This commit applies the changes made in part 1 to the
Settings app. For the real commit see framework/base.

This commit introduces here:
* Some setting constants changes to avoid clashes with PA.
* Removal of the pie search key setting.

Change-Id: I5b4abd6d32a3fc835466ac4cb1f0b9c851641061
Enable Ethernet tab in data usage

mStateSession is not initialized at the time hasEthernet is called to
set mShowEthernet, so Ethernet tab is not shown at the startup.
In this case, if the device doesn't support mobile network, user cannot
even select it from the context menu.

Bug: 8365419
Change-Id: I441971f18346c34a3adf3f18d9355075d9dce3f0
Signed-off-by: Jaewan Kim<jaewan@google.com>
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1

Conflicts:
	res/xml/pie_control.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/PieControl.java

Change-Id: I91e7950b88fe263f5f0e15041cfcee8cae05a7c2
Merge branch 'sgt7' into CM10.1
Removing now unused translations of pie_control_search_title

The commit "Merge Navigation Bar and Pie Controls button
config (2/2)" did remove the above mentioned i18n string.
This patch removes it for all other languages.

Change-Id: I613cf92c1e41e5b830984af33828da2d0f85561b
Settings: Update German translation

Patch Set 1:    * add translations for swap volume keys

Patch Set 2:    * add translations for
                  - Ad-Hoc network
                  - Pie controls

Patch Set 3:    * rename some strings
                * remove unneeded strings
                * fix whitespace error

Patch Set 4:    * rebase

Change-Id: I9816af50b17d728bb5578c98f80465a78ed8e711
Restore the opt-out for stats.

 * Apparently this is a bigger issue for a small number of extremely
   vocal users. We should respect their wishes, no matter how off-base
   their claims are in this context.

Change-Id: I9eef9a65260ec4e360d398f80d610a198c09c915
Merge "Enable Ethernet tab in data usage" into cm-10.1
Merge branch 'CyanogenMod' into cm-10.1

Conflicts:
	res/xml/device_info_settings.xml

Signed-off-by: Humberto Borba <humberos@gmail.com>
Merge branch 'sgt7' into CM10.1