summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | Merge "Update zen mode and qs strings on locale change" into lmp-devJason Monk2014-09-104-7/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Update zen mode and qs strings on locale changeJason Monk2014-09-094-7/+24
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Move zen mode constants and code to framework" into lmp-devJason Monk2014-09-105-43/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Move zen mode constants and code to frameworkJason Monk2014-09-105-43/+51
* | | | | | | | | | | | | | | | | | | Merge "Zen: make Condition available over @SystemApi" into lmp-devJohn Spurlock2014-09-101-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Zen: make Condition available over @SystemApiJohn Spurlock2014-09-101-0/+2
* | | | | | | | | | | | | | | | | | | | Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into ...George Mount2014-09-104-22/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Use intrinsic size for path animation in AnimatedVectorDrawableGeorge Mount2014-09-094-22/+67
* | | | | | | | | | | | | | | | | | | | | Merge "Fix fade transition not working with Activity Transitions." into lmp-devGeorge Mount2014-09-103-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix fade transition not working with Activity Transitions.George Mount2014-09-093-9/+10
* | | | | | | | | | | | | | | | | | | | | | Merge "Zen: Make condition providers available via @SystemApi." into lmp-devJohn Spurlock2014-09-102-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Zen: Make condition providers available via @SystemApi.John Spurlock2014-09-102-1/+3
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Fixed a bug where text could overlap in Quick settings" into lmp-devSelim Cinek2014-09-101-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | / / / / / / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fixed a bug where text could overlap in Quick settingsSelim Cinek2014-09-101-5/+5
* | | | | | | | | | | | | | | | | | | | | Merge "Use simpler layout for auto-redacted notifications" into lmp-devJorim Jaggi2014-09-102-12/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Use simpler layout for auto-redacted notificationsJorim Jaggi2014-09-092-12/+85
* | | | | | | | | | | | | | | | | | | | | | Merge "Inflate guts only when needed" into lmp-devJorim Jaggi2014-09-103-68/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Inflate guts only when neededJorim Jaggi2014-09-103-68/+112
| | |_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Only unbind agents of the user that is being refreshed" into lmp-devAdrian Roos2014-09-101-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Only unbind agents of the user that is being refreshedAdrian Roos2014-09-091-4/+11
* | | | | | | | | | | | | | | | | | | | | | Merge "Add system trust agents on first boot or when adding user" into lmp-devAdrian Roos2014-09-102-17/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Add system trust agents on first boot or when adding userAdrian Roos2014-09-102-17/+76
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Remember userId when stripping / rebuilding notification." into lmp-devKenny Guy2014-09-101-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Remember userId when stripping / rebuilding notification.Kenny Guy2014-09-081-1/+16
* | | | | | | | | | | | | | | | | | | | | | | Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-devChristoph Studer2014-09-102-17/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | NoLiService: Delete @removed meetsInterruptionFilterChristoph Studer2014-09-092-17/+0
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Notification: Use ViewStub for ProgressBar" into lmp-devChristoph Studer2014-09-103-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Notification: Use ViewStub for ProgressBarChristoph Studer2014-09-093-3/+26
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add feature flags for verified boot and securely remove users." into l...Adam Connors2014-09-102-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Add feature flags for verified boot and securely remove users.Adam Connors2014-09-082-0/+18
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-devYohei Yukawa2014-09-103-17/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Use public APIs to instantiate InputMethodSubtypeYohei Yukawa2014-09-103-17/+19
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyMana...Jessica Hummel2014-09-102-14/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.Jessica Hummel2014-09-102-14/+9
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Secure access to WifiScanner" into lmp-devVinit Deshpande2014-09-101-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Secure access to WifiScannerVinit Deshpande2014-09-081-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-102-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | CamcorderProfile: Add QUALITY_HIGH_SPEED_2160PZhijun He2014-09-092-1/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow protected wifi in connectivity tests" into lmp-devEric Rowe2014-09-103-28/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Allow protected wifi in connectivity testsEric Rowe2014-09-093-28/+47
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-devLajos Molnar2014-09-103-2/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec/Drm: move from getErrorCode to getDiagnosticInfoLajos Molnar2014-09-093-2/+39
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer/SubtitleController:fix add/select timed text on startRobert Shih2014-09-102-17/+30
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Improve dialog padding when title or body text are missing" into lmp-devAlan Viverette2014-09-103-7/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Improve dialog padding when title or body text are missingAlan Viverette2014-09-093-7/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "SoundTriggerHelper: handle media server death" into lmp-devEric Laurent2014-09-101-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | SoundTriggerHelper: handle media server deathEric Laurent2014-09-091-3/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ForSubscriber suffix to APIs w/ subId argument.Junda Liu2014-09-094-18/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix build." into lmp-devDianne Hackborn2014-09-101-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build.Dianne Hackborn2014-09-091-0/+5