summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | am 869b428b: am f5fa550a: Merge "Move new script group API into ScriptGroup ↵Yang Ni2015-04-224-30/+645
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class" * commit '869b428b29651934c1e99d71fdc715d3c482a522': Move new script group API into ScriptGroup class
| | * | | | | | | | | | | | | | | am f5fa550a: Merge "Move new script group API into ScriptGroup class"Yang Ni2015-04-224-30/+645
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5fa550afafa2276abce78b3e5779ce11dc16c68': Move new script group API into ScriptGroup class
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Move new script group API into ScriptGroup class"Yang Ni2015-04-224-30/+645
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Move new script group API into ScriptGroup classYang Ni2015-04-224-30/+645
| | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And mark existing methods and builder deprecated. Removed ScriptGroup2 class. Renamed nested class UnboundValue to Input. Marked classes Closure, Future, and Input as final. Change-Id: I362910c115e9d0173dc515674e08bf4878232879
* | | | | | | | | | | | | | | | | | Merge "Update activities to clear search term when a root that doesn't ↵Steve McKay2015-04-233-26/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support search is selected by the user."
| * | | | | | | | | | | | | | | | | | Update activities to clear search term when a root that doesn't support ↵Steve McKay2015-04-223-26/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | search is selected by the user. BUG=20495230 Change-Id: Iee2e2bd80dea6d368cad0911117e3759bdfe37d9
* | | | | | | | | | | | | | | | | | | Merge "Add channel index mask to AudioRecord"Andy Hung2015-04-232-12/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add channel index mask to AudioRecordAndy Hung2015-04-222-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d2504d3a7af6611d3ffa9a4c2d3665a2cf97fef
* | | | | | | | | | | | | | | | | | | | Merge "Infer value type for keyframes when it is undefined"Doris Liu2015-04-231-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Infer value type for keyframes when it is undefinedDoris Liu2015-04-221-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20140483 Change-Id: Idf6caea2a8eae803e33dd34b9c8f563ad12e1848
* | | | | | | | | | | | | | | | | | | | | am a5ee27b3: am ee066f57: Merge "cherrypick from lmp-docs docs: Add Wear ↵Luan Nguyen2015-04-234-31/+4526
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capability training Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0" into lmp-mr1-ub-docs * commit 'a5ee27b3aa60dc5f839e95e7d9c219f7bf59ea5d': cherrypick from lmp-docs docs: Add Wear Capability training Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0
| * | | | | | | | | | | | | | | | | | | | am ee066f57: Merge "cherrypick from lmp-docs docs: Add Wear Capability ↵Luan Nguyen2015-04-224-31/+4526
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | training Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0" into lmp-mr1-ub-docs * commit 'ee066f576e153bc11ea1a3991d0204c953d2c3fa': cherrypick from lmp-docs docs: Add Wear Capability training Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0
| | * | | | | | | | | | | | | | | | | | | Merge "cherrypick from lmp-docs docs: Add Wear Capability training Original ↵Luan Nguyen2015-04-224-31/+4526
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0" into lmp-mr1-ub-docs
| | | * | | | | | | | | | | | | | | | | | | cherrypick from lmp-docs docs: Add Wear Capability trainingLuan Nguyen2015-04-214-31/+4526
| | | | |_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0 bug: 20088602 Change-Id: I968dfe13a9d74cae52bedeb9cb333f514d188cb4
* | | | | | | | | | | | | | | | | | | | | am 679934f3: am 34997731: cherrypick from lmp-docs docs: Add Channel API ↵Luan Nguyen2015-04-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | summary for Wear. Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb * commit '679934f37f3e140b5dade8044bc1d759b8f4e948': cherrypick from lmp-docs docs: Add Channel API summary for Wear. Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
| * | | | | | | | | | | | | | | | | | | | am 34997731: cherrypick from lmp-docs docs: Add Channel API summary for ↵Luan Nguyen2015-04-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wear. Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb * commit '34997731954015ce4e946ce696d487db17b848c1': cherrypick from lmp-docs docs: Add Channel API summary for Wear. Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
| | * | | | | | | | | | | | | | | | | | | cherrypick from lmp-docs docs: Add Channel API summary for Wear.Luan Nguyen2015-04-211-0/+24
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb bug: 20089257 Change-Id: I25ad962ef847574d2152229ebb2ce268483c2a68
* | | | | | | | | | | | | | | | | | | | am 453100c0: (-s ours) am 3430f599: am ba43f7e9: Merge "Revert "Sometimes ↵Marco Nelissen2015-04-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the application context is null"" * commit '453100c06e3e62474e3ad36631deb5fe332bb227': Revert "Sometimes the application context is null"
| * | | | | | | | | | | | | | | | | | | am 3430f599: am ba43f7e9: Merge "Revert "Sometimes the application context ↵Marco Nelissen2015-04-221-54/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is null"" * commit '3430f59951328c6d17045fbc8f85f629723af541': Revert "Sometimes the application context is null"
| | * | | | | | | | | | | | | | | | | | am ba43f7e9: Merge "Revert "Sometimes the application context is null""Marco Nelissen2015-04-221-54/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba43f7e914cd2cb8145ffeb5720aa5e87be48b9b': Revert "Sometimes the application context is null"
| | | * | | | | | | | | | | | | | | | | Merge "Revert "Sometimes the application context is null""Marco Nelissen2015-04-221-54/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Revert "Sometimes the application context is null"Marco Nelissen2015-04-221-54/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d86281cb3da685672d89f964228980f6753adcae. Change-Id: Icaf8e1e4812f64060066331f9000be15c134d1d2
* | | | | | | | | | | | | | | | | | | | | Merge "Retain milestone timestamps of historical broadcast activity"Christopher Tate2015-04-231-17/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Retain milestone timestamps of historical broadcast activityChristopher Tate2015-04-221-17/+71
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use a ring buffer now instead of using arraycopy() every time we send a broadcast. Bug 20297662 Bug 20426398 Change-Id: I682461f358e5bc6ebc63bbeb87d0ad07d85fe4b6
* | | | | | | | | | | | | | | | | | | | | Merge "TIF: Cache multiple app private commands"Jae Seo2015-04-231-16/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | TIF: Cache multiple app private commandsJae Seo2015-04-221-16/+14
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19809952 Change-Id: I458ab436761e8fd7e54fc7f49d86550e7945dca9
* | | | | | | | | | | | | | | | | | | | | Merge "Implement DayNight theme for DocumentsUI"Alan Viverette2015-04-2337-59/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Implement DayNight theme for DocumentsUIAlan Viverette2015-04-2237-59/+110
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes tint colors for icons to use themed colorControlNormal. Bug: 20421157 Change-Id: I110a1d95f763332e7ca76cf8ab4125bd4d9a075e
* | | | | | | | | | | | | | | | | | | | | Merge "Add Context.MIDI_Service to the public API"Mike Lockwood2015-04-233-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Add Context.MIDI_Service to the public APIMike Lockwood2015-04-223-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I forgot this when the rest of MidiManager was made public. Change-Id: Ic5f8e2674d5b8e13bd88feebf3cf219f7af7fbcc
* | | | | | | | | | | | | | | | | | | | | | Merge "Fixed a regression with collapsed notification heights"Selim Cinek2015-04-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fixed a regression with collapsed notification heightsSelim Cinek2015-04-221-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could lead to collapsed notifications having and intrinsic height smaller than the collapsed size and notifications overlapping. Change-Id: Iabba19033f8069f1f75218280b97d3a1a45a5efb
* | | | | | | | | | | | | | | | | | | | | | am 75da2176: (-s ours) am 9e05ece7: am 0601a280: Merge "Sometimes the ↵Marco Nelissen2015-04-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application context is null" * commit '75da217605cb401c7cbd5023536a6d5c24a0af70': Sometimes the application context is null
| * | | | | | | | | | | | | | | | | | | | | am 9e05ece7: am 0601a280: Merge "Sometimes the application context is null"Marco Nelissen2015-04-221-34/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e05ece7ab8510fc3dade202a8647de22f4b0906': Sometimes the application context is null
| | * | | | | | | | | | | | | | | | | | | | am 0601a280: Merge "Sometimes the application context is null"Marco Nelissen2015-04-221-34/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0601a280e5db18ff2c084a0785504f959c2ff92f': Sometimes the application context is null
| | | * | | | | | | | | | | | | | | | | | | Merge "Sometimes the application context is null"Marco Nelissen2015-04-221-34/+54
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Sometimes the application context is nullMarco Nelissen2015-04-211-34/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when called from systemui. Bug: https://code.google.com/p/android/issues/detail?id=152173 Change-Id: Ic7b98e39fd9ad2436b855cf9f7f53d3e7a1948c0
* | | | | | | | | | | | | | | | | | | | | | Merge "Cancel a screenshot notification after a share target is chosen."Adam Powell2015-04-222-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Cancel a screenshot notification after a share target is chosen.Adam Powell2015-04-172-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the (relatively) new API for supplying a callback when a user makes a selection from the system ChooserActivity to clear out the screenshot notification after it has been shared to another app. Change-Id: If023a26d690c5ae8e29f28e2422f694ae4b654cb
* | | | | | | | | | | | | | | | | | | | | | | Merge "AAPT: Add flag to disable versioning of vector related XML"Adam Lesinski2015-04-223-4/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | AAPT: Add flag to disable versioning of vector related XMLAdam Lesinski2015-04-213-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT automatically versions XML files according to the SDK level in which their attributes were introduced. Support libraries know how to handle resources built against newer SDKs, so offer the option to disable some of the automatic versioning, namely vectors. Bug:19336994 Change-Id: I9f9d0ae8f2a0c28404f82e27de416f80e38493c9
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add hardware feature describing a car"Todd Kennedy2015-04-223-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add hardware feature describing a carTodd Kennedy2015-04-223-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to define a hardware feature for when Android is running embedded on a vehicle's headunit. This is not applicable when running Android on a phone and projecting onto a headunit. Bug: 20016089 Change-Id: I70e94564f7493afe70a49bf582a627c5ea9f0a60
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add PlaybackSettings for use with AudioTrack"Andy Hung2015-04-225-1/+371
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Add PlaybackSettings for use with AudioTrackAndy Hung2015-04-225-1/+371
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie59686d46869558d489a7600170ddace00e548d5
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't limit fullscreen stack window size to parent window size"Wale Ogunwale2015-04-221-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Don't limit fullscreen stack window size to parent window sizeWale Ogunwale2015-04-221-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous change limited the size of a window to the parent window size at max. so that child windows don't extend outside their parent stack when resized in a multi-window environment. This broke the wallpaper positioning functionality since the wallpaper is no longer bigger than it's containing stack so it can't be scrolled. Now, we only limit the window size to the parent window size if the window stack is not fullscreen. Bug: 19434096 Bug: 19225079 Change-Id: I1a8788727e6c4a91da45d8a87850093ef5a24edf
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add threading annotations"Tor Norbye2015-04-224-0/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Add threading annotationsTor Norbye2015-04-204-0/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These describe threading requirements for a given method, or threading promises made to a callback. Change-Id: If496067b12df3a0adedc32e4b4005cd1c2d400f3
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make read/write from/to XML persistent state more robust."Svet Ganov2015-04-222-8/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \