summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update HWUI to store its own SkBitmap objects"Derek Sollenberger2015-01-1417-202/+201
|\
| * Update HWUI to store its own SkBitmap objectsDerek Sollenberger2015-01-0917-202/+201
| | | | | | | | | | | | | | | | | | | | | | This enables us to... 1) simplify the lifecycle/ownership between Java and HWUI 2) remove DisplayListRenderer::drawBitmapData and associated logic 3) track pixel lifecycle using standard SkPixelRef refcounting 4) Remove uncessary calls to ref/unref the bitmap's pixels and colorTable Change-Id: I3c95078da20995444f6388a029414280fd654318
* | Force-commit changes on accept in spinner-style DatePickerDialogAlan Viverette2015-01-131-0/+3
| | | | | | | | | | Bug: 19005472 Change-Id: If500c7305282a5055b4617c242871e04d91c0bc3
* | am ef04ae79: Merge "Complete booting when frontmost activity is idle" into ↵Craig Mautner2015-01-131-11/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 82da2ee automerge: 1549346 * commit '1549346a98227c1f41fa4bd99921139f2cf97a14': Complete booting when frontmost activity is idle
| * \ am ef04ae79: Merge "Complete booting when frontmost activity is idle" into ↵Craig Mautner2015-01-131-11/+27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 82da2ee * commit '82da2ee927a86114f583b2ea8683076069e761e0': Complete booting when frontmost activity is idle
| | * \ am ef04ae79: Merge "Complete booting when frontmost activity is idle" into ↵Craig Mautner2015-01-131-11/+27
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'ef04ae79af58cc86c4312fac18c8a4eb24fc73ae': Complete booting when frontmost activity is idle
| | | * \ Merge "Complete booting when frontmost activity is idle" into lmp-mr1-devCraig Mautner2015-01-131-11/+27
| | | |\ \
| | | | * | Complete booting when frontmost activity is idleCraig Mautner2015-01-131-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The boot process is intended to complete when the frontmost activity becomes idle. This change fixes a corner case where the system was booting and the Home activity became idle when it was not at the front causing the system to never complete booting. Before ag/603303 a secondary stack was created for the TaskPersister at the beginning of activity manager systemReady(). Following that change the secondary stack was created for the first time when a task was restored from system ui recents when getTaskThumbnail() was called. At the time it was created it was also moved to the front of the stack order. If that stack creation happens to occur after the Home activity is started but before the Home activity becomes idle then the new stack will obscure the Home activity and the boot process does not complete. 1. This change adds a test for an idle activity coming to the front when a stack is moving to the front and we haven't completed booting yet. If this situation is detected the boot sequence is then completed. 2. This change fixes the stack ordering so that creating a new task when restoring recents does not automatically move the stack to the front. Fixes bug 18949470. Change-Id: I243f0bb4396b518a0a8835c0c7bdccb2581a3520
* | | | | | am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev automerge: 0f6da47Craig Mautner2015-01-132-10/+29
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 9d82182 * commit '9d82182f0c97271323d039b51e9179d2f4f2fa74': Add debug for ANR
| * | | | | am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-devCraig Mautner2015-01-132-10/+29
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 0f6da47 * commit '0f6da477cbf3232996770a17910d3e44a0b893ac': Add debug for ANR
| | * | | | am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-devCraig Mautner2015-01-132-10/+29
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '31ae17309e8c79c4b1a7b63a9c4bb43ae0849de2': Add debug for ANR
| | | * | | Merge "Add debug for ANR" into lmp-mr1-devCraig Mautner2015-01-132-10/+29
| | | |\ \ \
| | | | * | | Add debug for ANRCraig Mautner2015-01-132-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help for bug 17721767. Change-Id: If863f3e6536be8af2c189dcc37d503c4d6b663b4
* | | | | | | am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting ↵Tyler Gunn2015-01-133-2/+51
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMS conference call. 1/4" into lmp-mr1-dev automerge: c7105c4 * commit 'c7105c46002f5e47cde61d5cc3a92e557adc2fea': Fix for call timer resetting when starting IMS conference call. 1/4
| * | | | | | am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting ↵Tyler Gunn2015-01-133-2/+51
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMS conference call. 1/4" into lmp-mr1-dev * commit '0e5b3d4eabfa747bab39117d512d6218b8fa7783': Fix for call timer resetting when starting IMS conference call. 1/4
| | * | | | | am a27523e3: Merge "Fix for call timer resetting when starting IMS ↵Tyler Gunn2015-01-133-2/+51
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conference call. 1/4" into lmp-mr1-dev * commit 'a27523e3e0fd6c6cab18255151f2f9ec9a72f3d6': Fix for call timer resetting when starting IMS conference call. 1/4
| | | * | | | Merge "Fix for call timer resetting when starting IMS conference call. 1/4" ↵Tyler Gunn2015-01-133-2/+51
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | into lmp-mr1-dev
| | | | * | | Fix for call timer resetting when starting IMS conference call. 1/4Tyler Gunn2015-01-123-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added support in Conference for specifying the connect time when the conference is created. Bug: 18959443 Change-Id: I501edde3b62f6bf021eb7455089e80626013da12
* | | | | | | am 96f7ac84: Merge "Find wall clock RTC through sysfs" automerge: 41ef80eGreg Hackmann2015-01-131-5/+75
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: b5af40f * commit 'b5af40f040f7c227604f129bcf79784c349c2ad5': Find wall clock RTC through sysfs
| * | | | | | am 96f7ac84: Merge "Find wall clock RTC through sysfs" automerge: 41ef80eGreg Hackmann2015-01-131-5/+75
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '96f7ac84b51c3ceb913e78275e99e2f4f79ebe86': Find wall clock RTC through sysfs
| | * \ \ \ \ \ Merge "Find wall clock RTC through sysfs"Greg Hackmann2015-01-131-5/+75
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 41ef80e * commit '41ef80e7ff739d863ea5df0e129e54f953545212': Find wall clock RTC through sysfs
| | | * \ \ \ \ \ Merge "Find wall clock RTC through sysfs"Greg Hackmann2015-01-131-5/+75
| | | |\ \ \ \ \ \
| | | | * | | | | | Find wall clock RTC through sysfsGreg Hackmann2015-01-131-5/+75
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devices may have multiple RTCs. By default the kernel uses rtc0 to store the system time, but devices may override this (or even specify that none of them should be used for system time). Userspace can indirectly find the designated RTC through sysfs. During AlarmManagerService initialization, enumerate through all rtc class devices to locate the device with attribute hctosys=1. This is only done on devices without /dev/alarm, which has its own in-kernel mechanism to pick the RTC. Change-Id: Ife2b342c3590133ed316ddaf1799cbc1bfa6e6d9 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | | | | | am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg ↵Wink Saville2015-01-137-16/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnSubscriptionsChangedListener." into lmp-mr1-dev automerge: 9482799 * commit '948279954ac88ecfd0678713158175702d981c73': Rename reg/unreg OnSubscriptionsChangedListener.
| * | | | | | | | am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg ↵Wink Saville2015-01-137-16/+16
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnSubscriptionsChangedListener." into lmp-mr1-dev * commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7': Rename reg/unreg OnSubscriptionsChangedListener.
| | * | | | | | | am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into ↵Wink Saville2015-01-137-16/+16
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8': Rename reg/unreg OnSubscriptionsChangedListener.
| | | * | | | | | Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-devWink Saville2015-01-137-16/+16
| | | |\ \ \ \ \ \
| | | | * | | | | | Rename reg/unreg OnSubscriptionsChangedListener.Wink Saville2015-01-137-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To addOnSubscriptionsChangedListener and removeOnSubscriptionsChangedListener. Bug: 18984103 Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
* | | | | | | | | | am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into ↵Bryce Lee2015-01-131-1/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: e036ce2 automerge: 7e6fbb3 * commit '7e6fbb361be7a0045b8c71f0b8c56f113121a7d4': Update javadoc for DEFAULT_FEATURES deprecation.
| * | | | | | | | | am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into ↵Bryce Lee2015-01-131-1/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: e036ce2 * commit 'e036ce2e7044efcc8be71241a7e0a1523955f20c': Update javadoc for DEFAULT_FEATURES deprecation.
| | * | | | | | | | am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into ↵Bryce Lee2015-01-131-1/+4
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '9320e9f0a6af9269bc145ec7ab3d4b351f0614af': Update javadoc for DEFAULT_FEATURES deprecation.
| | | * | | | | | | Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-devBryce Lee2015-01-131-1/+4
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Update javadoc for DEFAULT_FEATURES deprecation.Bryce Lee2015-01-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18983343 Change-Id: I10936e292edf9146e7acca231632fb704054215c
* | | | | | | | | | | am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ↵Adam Powell2015-01-136-0/+145
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ResolverDrawerLayout" into lmp-mr1-dev automerge: 57744dd automerge: 1accc9c * commit '1accc9c12ba9610bc592666c5f46be727f92e68d': Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
| * | | | | | | | | | am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ↵Adam Powell2015-01-136-0/+145
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ResolverDrawerLayout" into lmp-mr1-dev automerge: 57744dd * commit '57744dd139f3d30ed1031319dd64b289a68ac3ba': Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
| | * | | | | | | | | am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ↵Adam Powell2015-01-136-0/+145
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ResolverDrawerLayout" into lmp-mr1-dev * commit '69c22e82e9c3e95f4689a57320de3199ffd29262': Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
| | | * | | | | | | | Merge "Add API for nested pre-processing of a11y events; fix ↵Adam Powell2015-01-136-0/+145
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ResolverDrawerLayout" into lmp-mr1-dev
| | | | * | | | | | | | Add API for nested pre-processing of a11y events; fix ResolverDrawerLayoutAdam Powell2015-01-076-0/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API for handling nested pre-processing of accessibility events similar to nested pre-scroll or pre-fling. This allows custom views to delegate a nested scroll to a parent via the accessibility system. Use this functionality to allow opening the ResolverDrawerLayout via accessibility commands. Bug 18827274 Change-Id: Icd5a502605b78a861bb03e7b11923841a72eb9ab
* | | | | | | | | | | | Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after ↵Winson Chung2015-01-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting changes." into lmp-mr1-dev automerge: 7ce662e -s ours automerge: b1a0a57 -s ours automerge: 2b59fb9 -s ours * commit '2b59fb902eb1f7d65f4a2fcfdaa6ea603d6dd6f0': DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
| * | | | | | | | | | | Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after ↵Winson Chung2015-01-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting changes." into lmp-mr1-dev automerge: 7ce662e -s ours automerge: b1a0a57 -s ours * commit 'b1a0a57ccab94e479087b620dcea2b39225693bb': DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
| | * | | | | | | | | | Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after ↵Winson Chung2015-01-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting changes." into lmp-mr1-dev automerge: 7ce662e -s ours * commit '7ce662ef870df34cd189b4ce9e487e496ba407dd': DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
| | | * | | | | | | | | Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after ↵Winson Chung2015-01-134-12/+17
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting changes." into lmp-mr1-dev
| | | | * | | | | | | | | DO NOT MERGE. Ensure screen pinning UI appears immediately after setting ↵Winson Chung2015-01-124-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes. Fixes an issue where the screen pinning UI in the Overview space would not appear on the first load after changing the setting, this was because the updated flag was not read before the tasks were preloaded prior to entering the Overview space. Bug: 18986736 Change-Id: I50dc9ff6d369fb3f2593f2bf2c1dc4608878820f
* | | | | | | | | | | | | am 6478b4f1: Merge "Clarify docs for user restrictions" into lmp-mr1-dev ↵Nicolas Prévot2015-01-131-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 6ab76bd automerge: e5d3ee8 * commit '6478b4f19a527b0ca26485aaac477e4d4c83a5d5': Clarify docs for user restrictions
| * | | | | | | | | | | | Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge: 6ab76bdNicolas Prévot2015-01-131-3/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e5d3ee8 * commit 'e5d3ee8e4fae72ef554a0e1084e88aea9ed8f020': Clarify docs for user restrictions
| | * | | | | | | | | | | Merge "Clarify docs for user restrictions" into lmp-mr1-devNicolas Prévot2015-01-131-3/+20
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 6ab76bd * commit '6ab76bd434d587fecefd5801905b09bcd32b1661': Clarify docs for user restrictions
| | | * | | | | | | | | | Merge "Clarify docs for user restrictions" into lmp-mr1-devNicolas Prévot2015-01-131-3/+20
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Clarify docs for user restrictionsAmith Yamasani2015-01-131-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify which restrictions are not relevant or behave differently for managed profiles. Bug: 18768578 Change-Id: Iac1435c5b931cbb889902a9b9e427bc0e0778bf2
* | | | | | | | | | | | | am c2d95052: am 62ceea31: am f5569413: docs: Fix broken link in Common ↵Ricardo Cervera2015-01-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intents automerge: c2d373a automerge: 8eb3060 automerge: cca3d44 * commit 'c2d950521919f35c75d60013276fb422789151a2': docs: Fix broken link in Common Intents
| * | | | | | | | | | | | am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: ↵Ricardo Cervera2015-01-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2d373a automerge: 8eb3060 automerge: cca3d44 * commit 'cca3d44b700db945e23ad357b031d7f6397e18b9': docs: Fix broken link in Common Intents
generated by cgit v1.1 at 2025-02-11 04:27:43 +0000