summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2Dan Pasanen2017-04-058-43/+43
|\ | | | | | | | | | | | | | | Android 7.1.2 Release 2 (N2G47E) # gpg: Signature made Mon 03 Apr 2017 01:41:49 AM CDT # gpg: using DSA key E8AD3F819AB10E78 # gpg: Can't check signature: No public key
| * Import translations. DO NOT MERGEBill Yi2017-02-025-24/+24
| | | | | | | | | | Change-Id: I463ce0acd3456ef53a651e58f580add9e5bc2cec Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBill Yi2016-11-046-29/+29
| | | | | | | | | | Change-Id: I62efcb9f8033f32e24cca1b5b67c720c50ec3e7b Auto-generated-cl: translation import
| * Import translations. DO NOT MERGE am: 0c2aec1373 -s oursBill Yi2016-09-170-0/+0
| |\ | | | | | | | | | | | | | | | am: e7373d970a -s ours Change-Id: Iaad2508555ee1f66d57922ba447d1744b8895c03
| | * Import translations. DO NOT MERGEBill Yi2016-09-170-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: 0c2aec1373 -s ours Change-Id: I65b91df4abfe0dd8de3f27c19a2997f147eeb771
| | | * Import translations. DO NOT MERGEBill Yi2016-09-164-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 31516661 Change-Id: I59f0be73c843e75ebcc3a699a31b968deffcdb74
| * | | Remove calls to silence ringer; these require new permissions in NEino-Ville Talvala2016-08-251-13/+2
| |\| | | | | | | | | | | | | | | | | | | | | | am: aaae0ae1bb Change-Id: I4ab0ffdb9aedd555a8cfcf6a2401d7dd0d4fde6b
| * | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBill Yi2016-08-050-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | am: 9353cf10ba -s ours Change-Id: I536fcb3b49875f04f45beadf0b252c96ee1ed04c
| * | | Import translations. DO NOT MERGEBill Yi2016-08-050-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: a7531cfaff -s ours Change-Id: I6be4fca8f9a6c98ccd5ace0767f8d23604c70d96
| * \ \ \ Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7905adb795 -s oursBill Yi2016-08-050-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8fd0698ddc -s ours Change-Id: Iba9ad4412ceb218efd5d21a591f420b3f4812878
| * \ \ \ \ Import translations. DO NOT MERGE am: 5a18f27ce1 -s oursBill Yi2016-08-050-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9ea376b3a5 -s ours Change-Id: I88a6c6dcda348c4c6184f320738c36a0008e0ee0
| * \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 54d4aa374f ↵Bill Yi2016-08-050-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: e71889a282 -s ours am: 9d439f5e85 -s ours Change-Id: I0d67a56486c9dd252d83d741e288aa09e6a80f21
| * \ \ \ \ \ \ Import translations. DO NOT MERGE am: 5f23bb8094 -s ours am: e7035ebabd -s ↵Bill Yi2016-08-050-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4fcefcdf08 -s ours Change-Id: I71e7a1244441508c8850b46988b10a0e0c6fd5a8
| * \ \ \ \ \ \ \ Import translations. DO NOT MERGE am: f424872b56 -s ours am: a0a1033987 -s ↵Bill Yi2016-08-050-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4f7455698e -s ours am: 93bb48d6b4 -s ours am: c1afd8b2b6 -s ours am: be37a3ad2b -s ours Change-Id: Ie1792943fcf166dc2b1743c31b6ca6e50174140a
| * \ \ \ \ \ \ \ \ Import translations. DO NOT MERGE am: 89c6d79299 -s ours am: 0dcfe0f64b -s ↵Bill Yi2016-08-050-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 064784017c -s ours am: 3996bc7af8 -s ours am: 5de028674b -s ours Change-Id: I59e29571e854aed92d111e25429d779b015c3b6d
* | | | | | | | | | | Automatic translation importcm-14.1_oldAbhisek Devkota2017-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaecead190000a1061384345940c54d94c0436059
* | | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-202-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic578992770cc121c16c9fdf3959b252d07a1d765
* | | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-151-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff51220de25226825777b34a8f4c99d413ecb0a4
* | | | | | | | | | | Automatic translation importAbhisek Devkota2017-03-082-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c29e04bf4c7354884b2e4cc3de8a9722fdbda38
* | | | | | | | | | | Automatic translation importMichael W2017-03-023-360/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I524bc1f0301a365c06680205b7ce0801eda98c78
* | | | | | | | | | | Automatic translation importAbhisek Devkota2017-02-165-1/+426
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife2696b5e57e0741c3a4c67422c39005fea25913
* | | | | | | | | | | Automatic translation importstaging/cm-14.1-cafrebaseMichael Bestas2016-12-30134-0/+10776
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2e0e8aaf824cafcbebd864756571b4f0e0de692
* | | | | | | | | | | Add Storage preference (1/2)dcalandria2016-12-3013-21/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows the user to change the default storage path. As in CM11, when the path is changed it sends an intent to the Gallery to set the default camera folder. Change-Id: I319decc3fdceca61050cf64f7e59afb06fedbf80 Fix writing to external storage. Change-Id: Ie0917b6c17129cd9ad2c69a2a53a4c3c3ee565b6 CameraSettingsActivity: Handle NPE when storage preference is already removed Fixes: http://pastebin.com/zv1sPid2 Change-Id: I05951f93b37759f4d8c9f2fde10c84eb388c4830
* | | | | | | | | | | Fix crash if Exif-Tag buffer-length and component-count are both 0tobigun2016-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad9b60d135b4f682c08c3bfc9698cdd10e1086ab
* | | | | | | | | | | Camera2: Fix Undo button behaviourNBruderman2016-12-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The undo behaviour depends on if the camera present secure settings or not. If secure, it should have 1 placeholder. 0 in other cases. Repro (for non secure cameras): 1. Leave only 3 pictures on the album. 2. Delete one picture, it will work fine. 3. Leave only 2 pictures on the album. 4. Try to delete, and you will go straight to the camera, without the undo pannel showing up. Change-Id: I360076381867a74628ffa492065ccf2ca53c72d6
* | | | | | | | | | | Introduce a 'device plugin' concept.Danny Baumann2016-12-304-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows device specific code to work with the camera while it's active. Change-Id: Iec78bf4d632c71f02e830eb2ac05504370bba660 camera2: Fix NPE * These values will be NULL when permissions haven't been accepted. Change-Id: I078deab9f7eff76f3d01087e2df7ff2f2a3c717d
* | | | | | | | | | | Camera2: Remove google help preferenceMichael Bestas2016-12-302-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieae3a79b1e7b470b9237f76808d7a038fcaee101
* | | | | | | | | | | Camera2: Add option to set max screen brightnessMichael Bestas2016-12-305-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
* | | | | | | | | | | Camera: Powerkey shutter (2/2)Danesh M2016-12-308-168/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70c5cd4dad547e2a9a96541b3104d52af5b5dd5c
* | | | | | | | | | | Camera: Disable Camera Launcher when both Front and Back sensors are not ↵Rajaram Gudivada2016-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detected Instead of checking only back sensor, this change checks both Front and Back sensors at the time of first time boot up and then if no sensors are present, disable all camera activities/CameraLauncher. Change-Id: Ic9ebd3140caa8df079fe01553d62e96207f2e159
* | | | | | | | | | | Camera2: Stop using GPS when going to backgroundnadlabak2016-12-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iacc46d3934c4a9fea7f01666334aaec213bb902b
* | | | | | | | | | | Camera2: Remove settings preferences only onceKonsta2016-12-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browsing through camera settings crashes on devices with only a back- or a front facing camera. Fix NPE on removing preferences that are already removed. Change-Id: I00b4549e18ea44975bf795da9384892d8ef2ee16
* | | | | | | | | | | Camera2: fix video recording for older driversPawit Pornkitprasan2016-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older drivers need the preview size to be the same as the video size. This check is done in getDesiredPreviewSize but was broken because CameraCapabilities return an empty list instead of null. Change-Id: If4d570923bd4809c8e651831a061414836e01a36
* | | | | | | | | | | Camera2: Only autofocus before a snap if we are actually in "auto" mode.Steve Kondik2016-12-301-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original commit by cyanogen 7daaa72d35c1f8820117768e4b129acd030bcefb Change-Id: I51853913f6459b599176910f7f486f59972eaf36
* | | | | | | | | | | Don't attempt to convert degree to orientation enum twiceEthan Chen2016-12-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Exif.getOrientation already calls getRotationForOrientationValues, which returns a degree value. Don't attempt to convert that degree value back into degrees, that makes no sense. Change-Id: Ie35a0683e2d36801a9130ec19e1b3aa1f48b92c2
* | | | | | | | | | | Merge b38e09a8253f8eed8ad7bfe550385be1d4e76be4 on remote branchLinux Build Service Account2016-12-157-35/+24
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic606d718ef4709da4354e691ab8b6f3fa150f144
| * | | | | | | | | | | Merge N-MR1 to remote branch.Lalit Kansara2016-12-087-35/+24
|/| | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | Change-Id: Ie3013b799b1b8ca2ce11b9e2d7c1d07d5f22668a
| * | | | | | | | | | Remove calls to silence ringer; these require new permissions in NEino-Ville Talvala2016-08-241-13/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In N, only applications with permission to manage do-not-disturb or notification settings are allowed to silence the ringer. Requesting that permission is not straightforward, and may not be the right solution, so for now, disable the ringer muting for video recording. Bug: 29591150 Change-Id: I630812c0e4ca813bf4fa123321d60a4be6c2fbf7
| * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devTreeHugger Robot2016-08-052-10/+10
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Import translations. DO NOT MERGEBill Yi2016-08-052-10/+10
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5756176e2205c848cfe0b7c4fc71422a2236c2d9 Auto-generated-cl: translation import
| * | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi2016-08-050-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7905adb795 -s ours Change-Id: Ia169ee5b8b79c91b0d1c08e4ff180c4e79bcf250
| | * | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devTreeHugger Robot2016-08-056-22/+22
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-08-050-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | am: 5a18f27ce1 -s ours Change-Id: I7afeef5b6fd050b72ef677c9bd1cae5bc8949be0
| | * | | | | | Import translations. DO NOT MERGEBill Yi2016-08-056-22/+22
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaa7668baff21d71fec7136d3311b1c057d5493ce Auto-generated-cl: translation import
| * | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 54d4aa374f ↵Bill Yi2016-08-050-0/+0
| |\| | | | | | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: e71889a282 -s ours Change-Id: Ifa7d47227938a35e1b784bff4155618324d65d73
| | * | | | Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-devBill Yi2016-08-050-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 54d4aa374f -s ours Change-Id: Iab0d552bd09205a145acc58bf8ff22bbe553f299
| | | * \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-devTreeHugger Robot2016-08-0523-165/+165
| | | |\ \ \ \
| * | | | | | | Import translations. DO NOT MERGE am: 5f23bb8094 -s oursBill Yi2016-08-050-0/+0
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | am: e7035ebabd -s ours Change-Id: I268e0850c8a6bb45f0f5cbd30c5cf49ca933c451
| | * | | | | Import translations. DO NOT MERGEBill Yi2016-08-050-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: 5f23bb8094 -s ours Change-Id: Icdf141e3f96644d3cb9488c5fb5dd82f295774a1
| | | * | | | Import translations. DO NOT MERGEBill Yi2016-08-0523-165/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82afa8f55a9af7ad39b50865bd9f4f028271dcf7 Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 16:55:11 +0000