Camera2: Fix AOSP mismerge

These changes missed the 4.4.3 merge
Also fix some megapixel inconsistencies, again!

Change-Id: Ic27e4fc8a7eee4261305c38f139405e1223d61bb
Automatic translation import

Change-Id: I5f47d0e0a8ff547328beb9f09950b65d61b07fbf
Automatic translation import

Change-Id: I29b60108fece8fcec4f143b9e00264a7be9fcf7f
Automatic translation import

Change-Id: Ia16e58ba3bcae21c2d3c7eadba79b0c4020185de
Automatic translation import

Change-Id: Idb2338322233dfd6e95561e7e6886437a2c44bd2
Camera2: LT translations

Few fixes

Change-Id: I0f8f79ee1e41b381ddb2f7789c7495ee41be2191
Automatic translation import

Change-Id: Ia6a34ad5a5e7a16356cbda5181a7348d243bdb77
Automatic translation import

Change-Id: I65c93465ff8e7ec8a58286ac185c07e67f9a775e
Automatic translation import

Change-Id: I6a8c6486c688d4e17dbf11d6b555a36e5a0331bb
Automatic translation import

Change-Id: If5a82559d870c6bc8cbed2f2791ea5ee9dc9c886
Camera2 : Make navigation bar and status bar transparent

Change-Id: Ia12a7fe3e23bf0666f32e655103bad8308e383fb
Automatic translation import

Change-Id: I4d73c8d6da920a7371043e5aa9b1f8cd5286f2b8
Automatic translation import

Change-Id: I88325e998e1134bb4df88a1ad943a040546555a3
Camera: Fix filtering of unsupported camcorder color effects

Change-Id: I365deeb17995175db873f6799cf0cde43ee61e96
Fix menu button margins.

Make sure the button is center aligned to the shutter and mode switcher
buttons.

Change-Id: I66c26c94fa7a43df57b9df0bcfe79dc60e4d9c6c
Merge "Fix menu button margins." into cm-11.0
Camera: Remove unused CM strings

Change-Id: If1e59c1f425a0195b921addf7a227db6306a5795
Camera: Cleanup qcom strings

* Remove leftover ZSL setting
* Use correct strings & arrays for video HDR
* Remove tons of unused strings
* Make some strings shorter to fit better in the settings popup
* Use consistent on/off strings

Change-Id: I5e77bdd62a00b2c868ce159e2fc0c2e0044dc0f5
Automatic translation import

Change-Id: I824a8f8c9c343330a2e12ca3f3c1234caf515d63
Adapt keyguard widget to new button margins.

Assures a nice transition when invoking the camera from the keyguard.

Change-Id: I4a2478c32ec54af76cf0c18e7f62b68baa8bb519