summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Moved limit constants for kernel and script groupYang Ni2015-05-111-7/+4
| | | | | | | | | b/20728113 so that we can share them with support lib. Change-Id: I231c0d20c41ee53342d8a975c2db5a31854b9d40 (cherry picked from commit 7b2a46fee0f95b9ae2485db36e0d279730623c4a)
* Merge "Revert the AssistAction class." into mnc-devChirag Shah2015-05-113-361/+0
|\
| * Revert the AssistAction class.Chirag Shah2015-05-083-361/+0
| | | | | | | | | | | | Bug 20654534 Change-Id: Ia85e7ebe2b8b168d0f9100e5006160ac969a296d
* | Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-devJean-Michel Trivi2015-05-114-19/+19
|\ \
| * | android.media.AudioRecord.Builder: no "capture preset"Jean-Michel Trivi2015-05-094-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Implement feedback to keep using "audio sources" instead of migrating to "capture presets" in AudioRecord.Builder. Bug 20887665 Change-Id: I4d7773102711c3a4f3f4050b3eb5600bfba889cd
* | | Merge "Provide a way for a stylus to access the quick settings menu" into ↵Mady Mellor2015-05-111-6/+12
|\ \ \ | | | | | | | | | | | | mnc-dev
| * | | Provide a way for a stylus to access the quick settings menuMady Mellor2015-05-011-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can access quick settings with a 2 finger drag, this change allows a stylus to access quick settings using press either stylus button + drag. Bug: 19916487 Change-Id: I3887f12980fc1be3d5a966ad8cc67abe93545a2a
* | | | Merge "QS: Defer tile view updates when opening the detail panel." into mnc-devJohn Spurlock2015-05-112-4/+23
|\ \ \ \
| * | | | QS: Defer tile view updates when opening the detail panel.John Spurlock2015-05-112-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20916542 Change-Id: I8e367fb2f8274eafb8d142fbfb54bc9be66b7546
* | | | | Merge "Disable input during Activity Transition." into mnc-devGeorge Mount2015-05-117-58/+101
|\ \ \ \ \
| * | | | | Disable input during Activity Transition.George Mount2015-05-077-58/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 19437530 While the actual Activity Transitions are running, input is stopped, except for the "back" button. Change-Id: I112e6252b9de05ece10a6267681fee5487e5ef6b
* | | | | | Merge "Add a few missing asserts" into mnc-devJohn Reck2015-05-111-0/+4
|\ \ \ \ \ \
| * | | | | | Add a few missing assertsJohn Reck2015-05-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20918138 Change-Id: I6823cfe531ff6f63a7d9fde22278e6780726c9f1
* | | | | | | Merge "SettingsLib: Do wifi processing in background" into mnc-devJason Monk2015-05-114-52/+112
|\ \ \ \ \ \ \
| * | | | | | | SettingsLib: Do wifi processing in backgroundJason Monk2015-05-114-52/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19520495 Change-Id: Iefad932bd523b26a19e5f902133563341aea7426
* | | | | | | | Merge "Improve javadoc on android.permission.PACKAGE_USAGE_STATS" into mnc-devZoltan Szatmary-Ban2015-05-111-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve javadoc on android.permission.PACKAGE_USAGE_STATSZoltan Szatmary-Ban2015-05-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20642656 Change-Id: Ib0cedee487950dab16134edd383ce5bd5374ff65
* | | | | | | | | Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-devSteve McKay2015-05-115-351/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Delete StandaloneActivity from M (DO NOT MERGE)Steve McKay2015-05-115-351/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The activity is already disabled by default. Fix an issue where copy support error handling was attempting to invoke StandaloneActivity. Change-Id: If15c312a183cae1b2a84517e7f7b3123c11bd619
* | | | | | | | | | Merge "Volume: Separate tint colors for active vs inactive sliders." into ↵John Spurlock2015-05-113-3/+13
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | Volume: Separate tint colors for active vs inactive sliders.John Spurlock2015-05-113-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20889746 Change-Id: I98f6a0eab8f2db41ea7e1ba8e141752ef774de9e
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-1173-400/+671
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-1173-400/+671
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9eba7c09bb5f603b1260ede6a3de590670af76ff Auto-generated-cl: translation import
* | | | | | | | | | | Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-devAmith Yamasani2015-05-116-23/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rename *AppIdle to *AppInactive per api-councilAmith Yamasani2015-05-086-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to setAppInactive and isAppInactive in a few places. Bug: 20823737 Change-Id: Ie57dbc0dd2842e771bb5fd9f69b8041aacaa005c
* | | | | | | | | | | | Merge "Volume: Use teal color for "End now"." into mnc-devJohn Spurlock2015-05-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Volume: Use teal color for "End now".John Spurlock2015-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20888718 Change-Id: I7f485dd5faa42ec7c2631c7bdeb3c03ddb46c530
* | | | | | | | | | | | Merge "Add new metrics categories for the two notification access screens." ↵John Spurlock2015-05-111-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | Add new metrics categories for the two notification access screens.John Spurlock2015-05-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20916418 Change-Id: Iafcaccaa465a2f121a6a1a2ba54b122173e45dc6
* | | | | | | | | | | | Merge "Changes as per API council review." into mnc-devPaul McLean2015-05-1112-448/+321
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Changes as per API council review.Paul McLean2015-05-0812-448/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20887665 Change-Id: I1da7a2c69d8cf20682c767294b1647beef33f90c
* | | | | | | | | | | | | Merge "Set FloatingToolbar width for portrait and landscape." into mnc-devAbodunrinwa Toki2015-05-114-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Set FloatingToolbar width for portrait and landscape.Abodunrinwa Toki2015-05-114-5/+12
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20711006 Change-Id: Iee061a1031406780eb0f85201543b644fbb4d813
* | | | | | | | | | | | Merge "log more settings actions" into mnc-devChris Wren2015-05-1116-26/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | log more settings actionsChris Wren2015-05-0816-26/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | airplane: quick and slow settings bluetooth: quick and slow settings cellular data: quick and slow settings dnd: quick and slow settings wifi: quick settings (slow already done) cast: quick settings user: quick settings include state of the toggle in the action log Back away slowly from the over-generalization of logging around handleClick, the semantics of mState are particular to the individual tiles. Bug: 20264417 Change-Id: I4cecbd3361af64d08de9fb41b8dca210a8086a80
* | | | | | | | | | | | Merge "Be more accepting of dex2oat errors." into mnc-devNarayan Kamath2015-05-111-48/+46
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Be more accepting of dex2oat errors.Narayan Kamath2015-05-071-48/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Narrow down the scope of caught exceptions. StaleDexCacheError has been removed (nobody was throwing it) and we shouldn't be catching the general "Exception". - Make try {} catch blocks for IOExceptions more fine-grained, only surrounding the code that throws them. And finally, don't return DEX_OPT_FAILED if installd couldn't run dex2oat successfully. We return DEX_OPT_SKIPPED instead. bug: 20888973 Change-Id: I25701e16157f42981ca767e343545cfe1d9cfbb2
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-1173-1760/+1812
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-1173-1760/+1812
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b9bc4b615456852e450db14f517a103fd8cb697 Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-1173-85/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-1173-85/+12
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8e10381534c60257e959e7d0eaf02deb0097142 Auto-generated-cl: translation import
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-112-6/+6
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0999d1abf6951574e9ba7fc6c8a608aaea4540de Auto-generated-cl: translation import
* | | | | | | | | | | UsbManager / UsbService / UsbDeviceManager: delete unused codeNick Kralevich2015-05-104-63/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions are never called. Change-Id: Ic436e1036bed717d2c64701fddd9a810abb9443e
* | | | | | | | | | | Merge "CEC: Update ARC feature flag on hotplug" into mnc-devJinsuk Kim2015-05-101-2/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CEC: Update ARC feature flag on hotplugJinsuk Kim2015-05-111-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARC feature flag should have been updated whenever hotplug[on] was detected, so that the ARC can be established upon device discovery. This CL rectifies the bug. Bug: 20817208 Change-Id: I5053ad3f576d0e405b6d8fc0c4e6584e66ed0a86
* | | | | | | | | | | | Fix devices with primary physical storage.Jeff Sharkey2015-05-102-33/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always assume the factory-reset default primary storage before parsing storage settings. Without this, we'd always default to picking internal emulated storage during first boot or upgrade. Bump version code to re-evaluate this for devices that default to physical storage as primary. Also restrict available move targets when storage is physical, since we can't really translate between multi-user and non-multi-user aware storage. Bug: 20836019 Change-Id: I186ded1aa3dd9cea67497a4f53b0973031174ccd
* | | | | | | | | | | | am d3b2d050: am 674b1fcb: Doc change: Update cards and landing contents.Dirk Dougherty2015-05-0923-47/+149
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3b2d0502dd30039789f2a2b6380a4344fdc865e': Doc change: Update cards and landing contents.
| * \ \ \ \ \ \ \ \ \ \ \ am 674b1fcb: Doc change: Update cards and landing contents.Dirk Dougherty2015-05-0923-47/+149
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '674b1fcbaae2142666a6fb8eea4595fa8c64e406': Doc change: Update cards and landing contents.
| | * | | | | | | | | | | | Doc change: Update cards and landing contents.Dirk Dougherty2015-05-0823-47/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iecb6a6aa0fd3835750979bea49ac782abaa3364a
* | | | | | | | | | | | | | Merge "allow top sleeping state in app process verification" into mnc-devGuang Zhu2015-05-091-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-09 07:18:00 +0000