summaryrefslogtreecommitdiffstats
path: root/core/java/com/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-devAbodunrinwa Toki2015-05-261-5/+1
|\
| * Hide the floatingtoolbar when content rect is invisible.Abodunrinwa Toki2015-05-261-5/+1
* | Support icons in the FloatingToolbarAbodunrinwa Toki2015-05-261-5/+74
|/
* Revert "resolved conflicts for merge of 47249f2a to mnc-dev"Dianne Hackborn2015-05-224-32/+42
* resolved conflicts for merge of 47249f2a to mnc-devFilip Gruszczynski2015-05-204-42/+32
|\
| * am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-devFilip Gruszczynski2015-05-203-13/+8
| |\
| | * Support for devices with a chin.Filip Gruszczynski2015-05-203-13/+8
| * | am 504bb9e7: Merge "Temporarily increase saved tombstone size. DO NOT MERGE" ...Christopher Ferris2015-05-071-1/+4
| |\ \ | | |/
| | * Temporarily increase saved tombstone size. DO NOT MERGEChristopher Ferris2015-05-071-1/+4
* | | Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mn...Jorim Jaggi2015-05-201-1/+0
|\ \ \
| * | | Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)Jorim Jaggi2015-05-191-1/+0
* | | | Merge "Turning off logging in ALSA device connection routines." into mnc-devPaul McLean2015-05-191-1/+1
|\ \ \ \
| * | | | Turning off logging in ALSA device connection routines.Paul McLean2015-05-191-1/+1
* | | | | Merge "Hide floating toolbar when selection is out of bounds." into mnc-devAbodunrinwa Toki2015-05-191-0/+26
|\ \ \ \ \
| * | | | | Hide floating toolbar when selection is out of bounds.Abodunrinwa Toki2015-05-191-0/+26
* | | | | | Merge "Fix wrong delay values for floatingtoolbar.hide/dismiss" into mnc-devAbodunrinwa Toki2015-05-191-2/+2
|\ \ \ \ \ \
| * | | | | | Fix wrong delay values for floatingtoolbar.hide/dismissAbodunrinwa Toki2015-05-191-2/+2
* | | | | | | Merge "Update power manager to track uid state like netstats." into mnc-devDianne Hackborn2015-05-191-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update power manager to track uid state like netstats.Dianne Hackborn2015-05-181-2/+4
* | | | | | | Merge "No input instead of disabling password entry" into mnc-devXiyuan Xia2015-05-191-0/+49
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | No input instead of disabling password entryXiyuan Xia2015-05-191-0/+49
| |/ / / / /
* | | | | | Merge "Hide floating toolbar when user interacts with screen." into mnc-devAbodunrinwa Toki2015-05-191-6/+102
|\ \ \ \ \ \
| * | | | | | Hide floating toolbar when user interacts with screen.Abodunrinwa Toki2015-05-191-6/+102
| | |/ / / / | |/| | | |
* | | | | | Merge "Add setting to disable assist data (1/2)" into mnc-devJorim Jaggi2015-05-191-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Add setting to disable assist data (1/2)Jorim Jaggi2015-05-181-0/+1
| |/ / / /
* | | | | Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" i...Adam Powell2015-05-191-12/+0
|\ \ \ \ \
| * | | | | Migrate uses of config_windowIsRound to Configuration.isScreenRoundAdam Powell2015-05-181-12/+0
| | |/ / / | |/| | |
* | | | | Revert "Backup/restore recents task list"Stefan Kuhne2015-05-181-14/+0
|/ / / /
* | | | Merge "Hide the floating toolbar faster." into mnc-devAbodunrinwa Toki2015-05-181-2/+5
|\ \ \ \
| * | | | Hide the floating toolbar faster.Abodunrinwa Toki2015-05-061-2/+5
* | | | | Merge "Support min/max height for FloatingToolbar overflow." into mnc-devAbodunrinwa Toki2015-05-181-60/+87
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Support min/max height for FloatingToolbar overflow.Abodunrinwa Toki2015-05-131-60/+87
* | | | | Merge "Mmm mmm mmm mmm." into mnc-devDan Sandler2015-05-161-125/+45
|\ \ \ \ \
| * | | | | Mmm mmm mmm mmm.Dan Sandler2015-05-151-125/+45
* | | | | | Merge "BatteryStats: Enable bluetooth energy collection" into mnc-devAdam Lesinski2015-05-151-1/+1
|\ \ \ \ \ \
| * | | | | | BatteryStats: Enable bluetooth energy collectionAdam Lesinski2015-05-151-1/+1
* | | | | | | Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesPars...Paul Mclean2015-05-151-14/+4
|\ \ \ \ \ \ \
| * | | | | | | Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"Paul Mclean2015-05-151-14/+4
* | | | | | | | Merge "DOn't save encryption settings when not encrypted" into mnc-devPaul Lawrence2015-05-151-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | DOn't save encryption settings when not encryptedPaul Lawrence2015-05-151-2/+5
* | | | | | | | | Merge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" int...Adam Lesinski2015-05-151-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | BatteryStatsHelper: Bluetooth wasn't being included in usage listAdam Lesinski2015-05-151-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"...Paul McLean2015-05-151-4/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | Addeding try/catch to card#/device# parsing in AlsaDevicesParser.javaPaul McLean2015-05-151-4/+14
| |/ / / / / /
* | | | | | | Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-devAdam Lesinski2015-05-152-5/+37
|\ \ \ \ \ \ \
| * | | | | | | Remove UID from kernel cpu accounting when uninstalledAdam Lesinski2015-05-122-5/+37
* | | | | | | | Merge "Parse uid_cputime proc file" into mnc-devAdam Lesinski2015-05-156-273/+323
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Parse uid_cputime proc fileAdam Lesinski2015-05-126-273/+323
* | | | | | | | Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" i...Adam Powell2015-05-151-1/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Preserve ResolverDrawerLayout fully collapsed state across relayoutAdam Powell2015-05-151-1/+8
| | |/ / / / / | |/| | | | |
generated by cgit v1.1 at 2025-02-13 17:38:00 +0000