summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "When in the Choose Account flow if the accounts list display was ↵Fred Quintana2011-11-161-1/+15
|\ | | | | | | initially skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display."
| * When in the Choose Account flow if the accounts list display was initiallyFred Quintana2011-11-151-1/+15
| | | | | | | | | | | | | | | | skipped if the user cancels out of adding an account the flow itself should be canceled rather than showing the accounts list display. Bug: 5599693 Change-Id: I5075e86656e237dddcb5e1d76e432e1cf525ab79
* | am 4c0e0dd2: am 3e7497b4: Merge "Eliminate hw.keyboards system properties." ↵Jeff Brown2011-11-153-11/+35
|\ \ | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '4c0e0dd29dcce33e7521b11d01d21d9431f3b264': Eliminate hw.keyboards system properties.
| * \ Merge "Eliminate hw.keyboards system properties." into ics-mr1Jeff Brown2011-11-153-11/+35
| |\ \
| | * | Eliminate hw.keyboards system properties.Jeff Brown2011-11-153-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop using system properties to publish information about the key character map path. Instead, we can retrieve it on demand by asking the window manager. It was possible to exhaust the supply of system properties when repeatedly adding and removing input devices. Bug: 5532806 Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
* | | | am 58c6f1b2: am c57bfa4a: Fix 5581164: Add abbreviated localized date stringsJim Miller2011-11-1563-0/+63
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '58c6f1b2e1528cd14bef94ae9c5b922b7751309c': Fix 5581164: Add abbreviated localized date strings
| * | | Fix 5581164: Add abbreviated localized date stringsJim Miller2011-11-1563-0/+63
| | | | | | | | | | | | | | | | Change-Id: I041eef02a67980d3b5c2f2fa12eae717c26e35be
* | | | am 8622fb34: am 34a62348: Merge "Fix 5581164: Use abbreviated day in ↵Jim Miller2011-11-151-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lockscreen" into ics-mr1 * commit '8622fb34769dc257a319ce8e7dab652312d6c049': Fix 5581164: Use abbreviated day in lockscreen
| * | | Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1Jim Miller2011-11-151-0/+1
| |\ \ \
| | * | | Fix 5581164: Use abbreviated day in lockscreenJim Miller2011-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a problem where the alarm status was forced to scroll on phones when the date string got too long. We now abbreviate the day on lock screen. Change-Id: I99990f1568282c65fb6ed4e78d20bb31b3487a8e
| * | | | am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-11-157-22/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d00c194c228e67851e5a0cb75c4bf4d99dd40f0': Import revised translations. DO NOT MERGE
| | * \ \ \ Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-11-147-22/+22
| | |\ \ \ \
| | | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-147-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I287b6b70df6795513fc1fc98d2fddaf310042e98
* | | | | | | am 06e4a400: am b3f2890a: am 047c4de2: Merge "Adding mobile microbenchmark ↵Tsu Chiang Chuang2011-11-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests." into ics-mr0 * commit '06e4a40017f1af75ec58d9d942ef0c4ddad20fd2': Adding mobile microbenchmark tests.
| * | | | | | am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0Tsu Chiang Chuang2011-11-151-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '047c4de2c548960fff428a92099003593cede5f8': Adding mobile microbenchmark tests.
| | * | | | | Merge "Adding mobile microbenchmark tests." into ics-mr0Tsu Chiang Chuang2011-11-142-19/+117
| | |\ \ \ \ \
| | | * | | | | Adding mobile microbenchmark tests.Tsu Chiang Chuang2011-11-102-19/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifcd67b0265045778965aeff8e213c3929da02c3d
* | | | | | | | am 7bc6600e: am 8a440477: Merge "Clean-up in TextView" into ics-mr1Gilles Debunne2011-11-151-28/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '7bc6600e60688ea37ee7f18b82cb16677c0f5e74': Clean-up in TextView
| * | | | | | | Merge "Clean-up in TextView" into ics-mr1Gilles Debunne2011-11-151-28/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Clean-up in TextViewGilles Debunne2011-11-101-28/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some variables that are no longer needed after the removal of context menu in TextView. Change-Id: I6d98bb356bd7b409a5230756849aef0f2896d4c5
* | | | | | | | | am 6a622c56: am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" ↵John Reck2011-11-151-13/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '6a622c5608e3f67efb7ba6a346ea4d8cfa5267ec': Call onScrollChanged when scrolling layers
| * | | | | | | | Merge "Call onScrollChanged when scrolling layers" into ics-mr1John Reck2011-11-151-13/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Call onScrollChanged when scrolling layersJohn Reck2011-11-141-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5533389 Treat layer scrolling as a no-op scroll by calling onScrollChanged with old scroll == new scroll Change-Id: I1dc2b94b37c65bf088806b8d28be32883e3b8bee
* | | | | | | | | | am 4e1fed76: am b90a70d1: Merge "Improve camera face detection javadoc." ↵Wu-cheng Li2011-11-151-7/+36
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '4e1fed76c19cc9656af55e57dc57979324322593': Improve camera face detection javadoc.
| * | | | | | | | | Merge "Improve camera face detection javadoc." into ics-mr1Wu-cheng Li2011-11-151-7/+36
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Improve camera face detection javadoc.Wu-cheng Li2011-11-151-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:4460717 Change-Id: I6e040911ce802e597e77dfdde1c92b75d51975c8
* | | | | | | | | | | am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ↵Jeff Sharkey2011-11-151-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'bc03c74c485669695805944a655795a6f9890956': Conservatively trim data usage stats.
| * | | | | | | | | | Merge "Conservatively trim data usage stats." into ics-mr1Jeff Sharkey2011-11-141-0/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Conservatively trim data usage stats.Jeff Sharkey2011-11-141-0/+4
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of trusting NTP time alone, use the most-conservative of system clock and NTP. Bug: 5584564 Change-Id: I5dd87fc009959b1cf0a7d660e385a0b1a8be238b
* | | | | | | | | | | am 5d536c94: am 539bcca9: Merge "Fix bug 5594320 - Overlay action bar decor ↵Adam Powell2011-11-154-23/+36
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout causes two measure passes" into ics-mr1 * commit '5d536c945da075036f151e5dbac86d74d32e2fc9': Fix bug 5594320 - Overlay action bar decor layout causes two measure passes
| * | | | | | | | | | Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure ↵Adam Powell2011-11-144-23/+36
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | passes" into ics-mr1
| | * | | | | | | | | Fix bug 5594320 - Overlay action bar decor layout causes two measure passesAdam Powell2011-11-144-23/+36
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing action bar overlay decor layouts hit a case in RelativeLayout that causes two measure passes for the main content. As this can be expensive, stick the bar and the content overlay into their own sub-layout and switch things to use a FrameLayout at the top level instead. Be explicit about the layout_width/height on ActionBar-containing decor layouts as the older decor layouts are. Change-Id: I4330f0f25841dd8058b94a320f93bf67fb56bf17
* | | | | | | | | | am 642de92b: am 9058435d: Merge "Fix races when content providers are ↵Jeff Brown2011-11-151-134/+190
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acquired and released." into ics-mr1 * commit '642de92b3500446ab2d2a84fbe4ff9c083e8c1af': Fix races when content providers are acquired and released.
| * | | | | | | | | Fix races when content providers are acquired and released.Jeff Brown2011-11-141-134/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes race conditions that occur very regularly when content providers are accessed from multiple threads at the same time. When a content provider is not already in the application's cache, the application needs to ask the ActivityManager to obtain it. Meanwhile, another thread can come along and do the same thing. This can cause problems because the application attempts to install two copies of the provider and the reference counts and other bookkeeping can get muddled. Similarly, there are races between releasing the last reference to a content provider and acquiring the content provider. It's possible for one thread to snatch the content provider from the jaws of death. We need to handle this explicitly to ensure that the content provider does not accidentally get released right after it was acquired by the other thread. This change ensures that the reference count bookkeeping and provider map are maintained in parallel while holding the same lock. Previously because the lock was dropped and reacquired in the middle of acquisition and removal, it was possible for a content provider with a zero reference count to be returned to the application. Likewise, it was possible for a content provider with a non-zero reference count to be disposed! This change also performs compensatory actions when races are detected to ensure that the necessary invariants are maintained throughout. In particular, it ensures that the application drops a duplicate reference to a content provider when no longer needed. Another way to solve this problem would be to explicitly prevent the races from happening in the first place by maintaining a table of content providers that are in the process of being acquired. The first thread to attempt to acquire the provider would store a record. The next thread would find the record and block until the first thread was finished. I chose not to implement the code in that manner because we would still have needed to perform compensatory actions in the case where the same provider binder has multiple logical names. Also, it could cause deadlocks if the attempt to acquire a content provider were re-entrant for some bizarre reason. Bug: 5547357 Change-Id: I2ad39a8acc30aaf7ae5354decd0a0a41e9b9c3da
* | | | | | | | | | am f2213aca: am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" ↵Daisuke Miyakawa2011-11-151-0/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'f2213acaae5073ea3b4f3f566f0e8c7dc976765b': Allow ContactsProvider to remove dulicates
| * | | | | | | | | Merge "Allow ContactsProvider to remove dulicates" into ics-mr1Daisuke Miyakawa2011-11-141-0/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Allow ContactsProvider to remove dulicatesDaisuke Miyakawa2011-11-141-0/+10
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5484956 Change-Id: Ie88af0c3d21919ca201f4fcdd46ca09e9f8d94c0
* | | | | | | | | | Merge "Clean up GenerationCache."Jeff Brown2011-11-141-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clean up GenerationCache.Jeff Brown2011-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use const references to keys and values where appropriate to avoid copying them unnecessarily. Deleted some dead code. Simplified a few pieces that were doing unnecessary redundant work. Change-Id: Ib2145b7094a40db2d679e05dafe050fe1e87b846
* | | | | | | | | | | am 3dd55677: am ff95f657: Merge "Fix 5579440: Add transport control view to ↵Jim Miller2011-11-1414-157/+384
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tablet unlock screens" into ics-mr1 * commit '3dd5567710168da330741cb4c4263cc03dd942f1': Fix 5579440: Add transport control view to tablet unlock screens
| * | | | | | | | | | Merge "Fix 5579440: Add transport control view to tablet unlock screens" ↵Jim Miller2011-11-1414-157/+384
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1
| | * | | | | | | | | | Fix 5579440: Add transport control view to tablet unlock screensJim Miller2011-11-1414-157/+384
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updated tablet layouts to support showing album art and transport control views in PIN, pattern and password screens of lock screen. It also allows the addition of a background protect asset and the ability to show the system wallpaper on layouts that define a transport_bg_protect view. Also updated layout to use new ICS-style buttons on lock screen and fixed bug with "forgot pattern" button where we were showing the emergency call icon. To avoid problems with leading ones in the mono-space clock font, we now right-justify status text on tablet and remove the AM/PM indicator. Status font size adjusted by UX. Added background protection drop shadow to transport control. Fixed portrait mode to be right-justified when transport is showing. Change-Id: I790292fc39f4588f87adc9d9241706817ae6baab
| * | | | | | | | | | Merge "Adding mobile microbenchmark tests." into ics-mr1Tsu Chiang Chuang2011-11-142-17/+115
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Adding mobile microbenchmark tests.Tsu Chiang Chuang2011-11-102-17/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifcd67b0265045778965aeff8e213c3929da02c3d
* | | | | | | | | | | | am 621f9716: am 6066a2b4: Merge "Fix uncaught exception in ↵Adam Cohen2011-11-141-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1 * commit '621f971691e3e819ddcd95898f4f93498e00c2ad': Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
| * | | | | | | | | | | Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue ↵Adam Cohen2011-11-141-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 5613241)" into ics-mr1
| | * | | | | | | | | | Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)Adam Cohen2011-11-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4646095f4cde9514425be8ab2dbf805d9788aa5c
* | | | | | | | | | | | am 2cfb873c: am 9d66da8a: Merge "Revert "Discard framebuffer rendering ↵Dave Burke2011-11-146-46/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queues when discarding layers"" into ics-mr1 * commit '2cfb873c9f0b56f2c7d694a21c968511223933af': Revert "Discard framebuffer rendering queues when discarding layers"
| * | | | | | | | | | | Merge "Revert "Discard framebuffer rendering queues when discarding layers"" ↵Dave Burke2011-11-146-46/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1
| | * | | | | | | | | | | Revert "Discard framebuffer rendering queues when discarding layers"Dave Burke2011-11-146-46/+2
| | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit da96f8ac2c1c35a54f3f36e6d776cb386a251d03.
generated by cgit v1.1 at 2025-03-22 04:36:09 +0000