summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QS: Create the tile background once per tile.John Spurlock2014-11-041-6/+7
| | | | | Bug: 18219320 Change-Id: I15cbb7623c3e81b724fb0c4e830ae4e6615552dc
* Merge "QS: New rotation-lock tile icon, using AVDs." into lmp-mr1-devJohn Spurlock2014-11-0448-140/+1439
|\
| * QS: New rotation-lock tile icon, using AVDs.John Spurlock2014-11-0348-140/+1439
| | | | | | | | | | | | | | | | | | Also: - Better icon change detection, unify tile.icon vs tile.iconId. - Fix regression in touch feedback by fixing a11y string calculation. Bug: 17426910 Change-Id: I14772f4e9b3be127bc39106ae9146ed46488fa48
* | Merge "An intent forwarded from a chooser intent will be a chooser too." ↵Nicolas Prevot2014-11-043-35/+64
|\ \ | | | | | | | | | into lmp-mr1-dev
| * | An intent forwarded from a chooser intent will be a chooser too.Nicolas Prevot2014-11-033-35/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a chooser intent is fired: If the user picks "work" or "personal apps": send a chooser intent to the other profile instead of sending a normal intent. Also using a userId instead of a userHandle for the target user. BUG:16514027 Change-Id: I2e45cd57ad72e9b7280e772b31fc10938642ba59
* | | Merge "Do not fix uris inside the system." into lmp-mr1-devNicolas Prevot2014-11-041-2/+5
|\ \ \
| * | | Do not fix uris inside the system.Nicolas Prevot2014-10-311-2/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we fix uris by adding the user id they belong to, the extras of the intent are unpacked and repacked. This must not happen inside the system process. It happened when ResolverActivity was handling an activity intent coming from a different user. BUG:18198630 Change-Id: I869897013bb2e5522584b404e87a8f20e7943b60
* | | Merge "Show message when intent is forwarded across profiles." into lmp-mr1-devSander Alewijnse2014-11-041-0/+27
|\ \ \
| * | | Show message when intent is forwarded across profiles.Sander Alewijnse2014-11-031-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In resolver activity. Solution uses the contentUserHint. Bug:17199630 Change-Id: I208e55a2bb37c7cd147240986c7659fc66f3e228
* | | | Merge "Remove deprecated DateFormat APIs." into lmp-mr1-devNarayan Kamath2014-11-043-28/+73
|\ \ \ \
| * | | | Remove deprecated DateFormat APIs.Narayan Kamath2014-11-033-28/+73
| | |_|/ | |/| | | | | | | | | | | | | | bug: 18074066 Change-Id: I99cef45105c9f25075c596cf4f52ec5573565596
* | | | am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the ↵Mark Renouf2014-11-040-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours * commit '2750e9ffe1df82fa9f81b9a8fdd311ceb2deacae':
| * \ \ \ am 4cc7ae80: If no display settings are matched, return the first one. DO ↵Mark Renouf2014-11-040-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours * commit '4cc7ae80387df1556cd4f2a0db75cf91057f7609':
| | * \ \ \ If no display settings are matched, return the first one. DO NOT MERGE ↵Mark Renouf2014-11-040-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: cf0f740 -s ours automerge: 01afc37 -s ours * commit '01afc37403a244e75fbfa385b197d76e476213e8':
| | | * \ \ \ If no display settings are matched, return the first one. DO NOT MERGEMark Renouf2014-10-310-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: cf0f740 -s ours * commit 'cf0f740e39f79da3fc8367c61ed473273248e8c1': If no display settings are matched, return the first one. DO NOT MERGE
* | | | \ \ \ \ am 2faa0c53: am 066f97e7: Merge "Preserve explicit consumed state in ↵Mark Renouf2014-11-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours * commit '2faa0c532c38cd171b9fa4843cb9ef43621f9f4e':
| * | | | | | | am 066f97e7: Merge "Preserve explicit consumed state in ↵Mark Renouf2014-11-040-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours * commit '066f97e79bce5ac6722f44dcb411f9642c40026c':
| | * | | | | | Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT ↵Mark Renouf2014-11-040-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours * commit 'ff2e71830cafe063e876e5a56db0d33a8a5ba679':
| | | * | | | | Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT ↵Mark Renouf2014-10-300-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into klp-modular-dev automerge: 7be03da -s ours * commit '7be03da0d4365346934c9d6672526119765d1047': Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
* | | | \ \ \ \ \ am eac757a8: am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, ↵kmccormick2014-11-040-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 * commit 'eac757a8a26ed4839aca716845fdec1d6ad0842f':
| * | | | | | | | am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, ↵kmccormick2014-11-040-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 * commit 'b2dfaf0ee621642190598b32b5ead861402b32ec':
| | * | | | | | | am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." ↵kmccormick2014-11-040-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-docs automerge: 3e92c4a automerge: 5298190 * commit '5298190a30288d29cb9107d89b00411def3e469b':
| | | * | | | | | am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." ↵kmccormick2014-10-309-102/+150
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-docs automerge: 3e92c4a * commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7': Doc update: deliv receipt, rate exceeded, bug fixes.
* | | | \ \ \ \ \ \ Merge "TIF: Fix a typo and remove an unused method in TvInputService" into ↵Dongwon Kang2014-11-041-14/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | | | | | | | TIF: Fix a typo and remove an unused method in TvInputServiceDongwon Kang2014-11-031-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c0233678c08a7070ffe507d9671e1ab669fdfd8
* | | | | | | | | | | Merge "AudioService: fix cross deadlock" into lmp-mr1-devEric Laurent2014-11-041-89/+108
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | AudioService: fix cross deadlockEric Laurent2014-11-031-89/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross deadlock between VolumeStreamState.class and VolumeStreamState instance synchronization. Do not synchronize on VolumeStreamState instance anymore. Also document the locking order for synchronization objects related to volume management. Bug: 18159081. Change-Id: Ibfe0759215cdac778408b95191cf0fd96bf46312
* | | | | | | | | | | | am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to ↵David Friedman2014-11-041-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | work properly on Windows Bug: 17192985" into lmp-docs * commit 'e20e2b9a4863144633bb5ba9d7bedf7d0948c760': Fixed ADB documentation to work properly on Windows Bug: 17192985
| * | | | | | | | | | | am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on ↵David Friedman2014-11-041-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows Bug: 17192985" into lmp-docs * commit '5a416a4905ba2f347a9837c1f578327c239f5910': Fixed ADB documentation to work properly on Windows Bug: 17192985
| | * | | | | | | | | | am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: ↵David Friedman2014-11-041-1/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17192985" into lmp-docs * commit 'a827de4e8bcd8d90987387b1acf8d8856104e21c': Fixed ADB documentation to work properly on Windows Bug: 17192985
| | | * \ \ \ \ \ \ \ \ \ Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" ↵David Friedman2014-11-041-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs
| | | | * | | | | | | | | | Fixed ADB documentation to work properly on WindowsDavid Friedman2014-10-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17192985 Change-Id: Iea9eb4e1eb53718ddfb0ca3e1c5f09504f987457
* | | | | | | | | | | | | | Merge "Clean up public API of SubInfoRecord." into lmp-mr1-devStuart Scott2014-11-043-93/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Clean up public API of SubInfoRecord.Stuart Scott2014-11-033-93/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 17575308 Change-Id: I047ce11fb7835d500652b7ef340a30c052e96b21
* | | | | | | | | | | | | | | am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev ↵Deepanshu Gupta2014-11-044-35/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 9b64954 * commit '0a2e42d4afe9aa81cc41674102dfc999496db845': Fix BridgeContext.get*ResourceValue()
| * | | | | | | | | | | | | | Merge "Fix BridgeContext.get*ResourceValue()" into lmp-devDeepanshu Gupta2014-11-044-35/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 9b64954 * commit '9b64954cb5b30b03abaae0b24132e1b1876f8af1': Fix BridgeContext.get*ResourceValue()
| | * | | | | | | | | | | | | Merge "Fix BridgeContext.get*ResourceValue()" into lmp-devDeepanshu Gupta2014-11-034-35/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix BridgeContext.get*ResourceValue()Deepanshu Gupta2014-10-304-35/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getFrameworkResourceValue() and getProjectResourceValue() never really returned the defValue passed to them, instead creating a new id for non-existent resources. We now checks for the existence of the resources before trying to obtain the id. Change-Id: Ie3103ba32af6186651a5f77c27d1efc33dc2bcc7
* | | | | | | | | | | | | | | | am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev ↵Deepanshu Gupta2014-11-041-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: c23487a * commit '33996b98787c4625f9cd4a8e38e6a88458773276': Support framework menus in ActionBar
| * | | | | | | | | | | | | | | Merge "Support framework menus in ActionBar" into lmp-devDeepanshu Gupta2014-11-041-6/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: c23487a * commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9': Support framework menus in ActionBar
| | * | | | | | | | | | | | | | Merge "Support framework menus in ActionBar" into lmp-devDeepanshu Gupta2014-11-031-6/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Support framework menus in ActionBarDeepanshu Gupta2014-10-301-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for adding menus in the framework namespace to the ActionBar preview. If a menu id name begins with the android namespace prefix (android:) we find the framework menu and render it. Change-Id: If52910b46154591883af2b2f357e72eea6f84235
* | | | | | | | | | | | | | | | am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into ↵Deepanshu Gupta2014-11-046-184/+596
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev automerge: 84a89ed * commit 'cd5f3bab37ef1dc041489f53f565416d295916d9': Use the right layout for inflating Action Bar.
| * | | | | | | | | | | | | | | Merge "Use the right layout for inflating Action Bar." into lmp-devDeepanshu Gupta2014-11-046-184/+596
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 84a89ed * commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a': Use the right layout for inflating Action Bar.
| | * | | | | | | | | | | | | | Merge "Use the right layout for inflating Action Bar." into lmp-devDeepanshu Gupta2014-11-036-184/+596
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Use the right layout for inflating Action Bar.Deepanshu Gupta2014-10-306-184/+596
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The choice of Action Bar layout depends on the theme. This also affects the widget used to render the Action Bar. Bug: http://b.android.com/77853 Change-Id: I6219a02853b4cd207a6125a5ed96fa5d16699460
* | | | | | | | | | | | | | | | am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 ↵Baligh Uddin2014-11-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours * commit 'aa816de4e061ae5a70c759a1c6e55d111c636b6d': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-11-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 07dd521 -s ours * commit '07dd52188ccafac3cec01122b132666f2bd8e32e': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-11-0338-200/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18218486 Change-Id: I929129a2c443e4db78e0ad4e78e653a7cd603855 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-devNancy Chen2014-11-043-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-25 20:50:25 +0000