summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove unnecessary PKCS#1 authorization on legacy keys." into mnc-devAlex Klyubin2015-06-172-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary PKCS#1 authorization on legacy keys.Alex Klyubin2015-06-172-6/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mn...Chris Manton2015-06-173-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add keys to handle GSM and CDMA roaming/non roaming overridesChris Manton2015-06-173-0/+41
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Refactor Drawable.getDither() to isDither()" into mnc-devAlan Viverette2015-06-179-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Drawable.getDither() to isDither()Alan Viverette2015-06-179-11/+11
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "remove setLatestEventInfo"" into mnc-devChris Wren2015-06-175-17/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "remove setLatestEventInfo"Chris Wren2015-06-175-17/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add DisconnectCause for CDMA activated case." into mnc-devAndrew Lee2015-06-171-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DisconnectCause for CDMA activated case.Andrew Lee2015-06-161-5/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add matching xml attributes for existing Toolbar properties" into mnc-devAdam Powell2015-06-175-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add matching xml attributes for existing Toolbar propertiesAdam Powell2015-06-165-0/+37
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "remove setLatestEventInfo" into mnc-devChris Wren2015-06-175-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove setLatestEventInfoChris Wren2015-06-155-2/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Bring back screenshot API." into mnc-devDianne Hackborn2015-06-174-11/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back screenshot API.Dianne Hackborn2015-06-164-11/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "AudioTrack.Builder should throw exception on failure." into mnc-devAndy Hung2015-06-171-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack.Builder should throw exception on failure.Andy Hung2015-06-171-3/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "AudioRecord.Builder should throw exception on failure." into mnc-devAndy Hung2015-06-171-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | / / / / / / / / / / / / / / / / / / / / / / / / / / / | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioRecord.Builder should throw exception on failure.Andy Hung2015-06-171-4/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Prefer GCM to CBC or CTR in documentation." into mnc-devAlex Klyubin2015-06-173-23/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer GCM to CBC or CTR in documentation.Alex Klyubin2015-06-173-23/+23
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-devEino-Ville Talvala2015-06-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera2: Do not throw unexpected runtime exception to appEino-Ville Talvala2015-06-171-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Improve documentation for keys requiring user auth." into mnc-devAlex Klyubin2015-06-175-75/+209
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation for keys requiring user auth.Alex Klyubin2015-06-175-75/+209
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixed a jump with the panel scrim" into mnc-devSelim Cinek2015-06-174-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a jump with the panel scrimSelim Cinek2015-06-164-3/+28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't reinflate signal icons unless we really need to." into mnc-devJason Monk2015-06-171-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't reinflate signal icons unless we really need to.Jason Monk2015-06-171-0/+16
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add carrier config variable to hide sim lock setting ui." into mnc-devJunda Liu2015-06-173-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add carrier config variable to hide sim lock setting ui.Junda Liu2015-06-173-0/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Camera2: Handle getting input surface failures" into mnc-devChien-Yu Chen2015-06-171-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera2: Handle getting input surface failuresChien-Yu Chen2015-06-161-3/+7
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Camera2: fix high speed request builder creation issue" into mnc-devZhijun He2015-06-171-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera2: fix high speed request builder creation issueZhijun He2015-06-171-0/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Expose AES GCM backed by Android Keystore." into mnc-devAlex Klyubin2015-06-179-12/+630
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose AES GCM backed by Android Keystore.Alex Klyubin2015-06-179-12/+630
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Handle negative view types properly in getScrapView" into mnc-devYigit Boyar2015-06-171-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle negative view types properly in getScrapViewYigit Boyar2015-06-161-5/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop support for P-192 EC keys." into mnc-devAlex Klyubin2015-06-171-10/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop support for P-192 EC keys.Alex Klyubin2015-06-171-10/+9
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Map >= 24bit encodings to ENCODING_PCM_FLOAT" into mnc-devPaul McLean2015-06-172-6/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map >= 24bit encodings to ENCODING_PCM_FLOATPaul McLean2015-06-172-6/+34
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Drag to select text: add some slop for moving between lines" into mnc-devMady Mellor2015-06-171-9/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drag to select text: add some slop for moving between linesMady Mellor2015-06-171-9/+35
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Insertion cursor: add some slop for moving between lines" into mnc-devMady Mellor2015-06-171-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Insertion cursor: add some slop for moving between linesMady Mellor2015-06-171-1/+9
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Split control background into 40dp and 32dp diameter versions" into mn...Alan Viverette2015-06-173-9/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split control background into 40dp and 32dp diameter versionsAlan Viverette2015-06-163-9/+28