summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | Merge "Add resources to recyclerview dependency."Deepanshu Gupta2015-04-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add resources to recyclerview dependency.Deepanshu Gupta2015-04-211-1/+3
* | | | | | | | | | | | | | | | | | | | | | Merge "Make fingerprint enroll/authenticate haptic feedback part of framework."Jim Miller2015-04-213-20/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Make fingerprint enroll/authenticate haptic feedback part of framework.Jim Miller2015-04-203-20/+24
* | | | | | | | | | | | | | | | | | | | | | Merge "Add optional package context to sysui action metrics."Chris Wren2015-04-212-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add optional package context to sysui action metrics.Chris Wren2015-04-212-2/+7
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Rediscover your own notifications.Dan Sandler2015-04-215-0/+71
| |_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag"Andrei Kapishnikov2015-04-218-7/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flagAndrei Kapishnikov2015-04-218-7/+102
* | | | | | | | | | | | | | | | | | | | | Merge "Rename native DisplayListRenderer to DisplayListCanvas"Chris Craik2015-04-2114-121/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Rename native DisplayListRenderer to DisplayListCanvasChris Craik2015-04-2014-121/+115
* | | | | | | | | | | | | | | | | | | | | | Merge "TIF: Fix incorrect uses of INPUT_STATE_XXX"Jae Seo2015-04-212-58/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | TIF: Fix incorrect uses of INPUT_STATE_XXXJae Seo2015-04-212-58/+45
* | | | | | | | | | | | | | | | | | | | | | | Merge "MediaSync: update code example for setCallback."Wei Jia2015-04-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | MediaSync: update code example for setCallback.Wei Jia2015-04-201-1/+1
* | | | | | | | | | | | | | | | | | | | | | | am 2da31b1e: am 886e8e11: am 2fdd83a9: am d2545775: am 4c20df0b: am 4aebbfbb:...Luan Nguyen2015-04-211-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am 886e8e11: am 2fdd83a9: am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs:...Luan Nguyen2015-04-211-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 2fdd83a9: am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel ...Luan Nguyen2015-04-211-0/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary f...Luan Nguyen2015-04-211-0/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." int...Luan Nguyen2015-04-211-0/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docsLuan Nguyen2015-04-211-0/+24
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Add Channel API summary for Wear." into lmp-docsLuan Nguyen2015-04-211-0/+24
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | | | | | | | docs: Add Channel API summary for Wear.Luan Nguyen2015-04-171-0/+24
* | | | | | | | | | | | | | | | | | | | | | | | | | | am da506ffa: am 14818725: am 80f99121: Merge "Prevent infinite layout and wal...Craig Mautner2015-04-211-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 14818725: am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"Craig Mautner2015-04-211-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"Craig Mautner2015-04-211-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Prevent infinite layout and wallpaper flashing"Craig Mautner2015-04-211-2/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Prevent infinite layout and wallpaper flashingtiger_huang2015-03-311-2/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Introduces navigation keycodes."Joseph Cooper2015-04-214-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces navigation keycodes.Joseph Cooper2015-04-164-2/+28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix build."Dan Sandler2015-04-212-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build.Dan Sandler2015-04-212-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "SecurityController: track VPN for all users"Robin Lee2015-04-214-159/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | SecurityController: track VPN for all usersRobin Lee2015-04-214-159/+91
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add ashmem stats to Parcels."Dan Sandler2015-04-212-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ashmem stats to Parcels.Dan Sandler2015-04-162-0/+20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove unsed failedAttemptWarning in reportFailedUnlockAttempt()."Thiemo Nagel2015-04-211-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unsed failedAttemptWarning in reportFailedUnlockAttempt().Thiemo Nagel2015-04-201-3/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Final removal of CONNECTIVITY_ACTION_IMMEDIATE.Erik Kline2015-04-213-15/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Listen for CONNECTIVITY_ACTION instead of _IMMEDIATE"Erik Kline2015-04-212-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Listen for CONNECTIVITY_ACTION instead of _IMMEDIATEErik Kline2015-04-212-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3bbd87dd: am 1f4f92ed: am b6feabcf: Merge "Frameworks/base: Use better Cla...Andreas Gampe2015-04-211-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | / / / / / / / / / / / / / / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1f4f92ed: am b6feabcf: Merge "Frameworks/base: Use better Class.forName in...Andreas Gampe2015-04-211-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"Andreas Gampe2015-04-211-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Frameworks/base: Use better Class.forName in ZygoteInit"Andreas Gampe2015-04-211-1/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Frameworks/base: Use better Class.forName in ZygoteInitAndreas Gampe2015-04-201-1/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "DocumentsUI: Save source file list into BaseActivity.State."Daichi Hirono2015-04-212-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DocumentsUI: Save source file list into BaseActivity.State.Daichi Hirono2015-04-202-4/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Potential fix for apps disappearing in launcher on system server crash"Sunny Goyal2015-04-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Potential fix for apps disappearing in launcher on system server crashSunny Goyal2015-04-201-0/+1