Chet Haase
70631fa464
am a111ceab: am a934ad11: Merge "Speed up user-switching wallpaper changes" into jb-mr2-dev
...
* commit 'a111ceab03410100a4b67328a99feb6299bd7bc5':
Speed up user-switching wallpaper changes
2013-04-30 17:18:07 -07:00
Chet Haase
a111ceab03
am a934ad11: Merge "Speed up user-switching wallpaper changes" into jb-mr2-dev
...
* commit 'a934ad112c9da1c7a342a990fcb06bae2ea7485e':
Speed up user-switching wallpaper changes
2013-04-30 17:04:58 -07:00
Svetoslav
9af61ff66a
am 5473ffba: am f6a2598f: Merge "Removing a debug check when logging fstrim events." into jb-mr2-dev
...
* commit '5473ffba405af12f2c5d3a7363ed959a9648eaf4':
Removing a debug check when logging fstrim events.
2013-04-30 16:45:49 -07:00
Svetoslav
0a2ac8c622
am 86fe273f: am cff4b18e: Merge "Perform idle maintenance when the device is charging." into jb-mr2-dev
...
* commit '86fe273f26ff8957a096911a20f4a48df5de470a':
Perform idle maintenance when the device is charging.
2013-04-30 16:45:47 -07:00
Baligh Uddin
cb79506984
am 5bf93be4: (-s ours) am f0e8c78a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '5bf93be4f45d62e685d2d124fa105d7fe5e9ffd1':
Import translations. DO NOT MERGE
2013-04-30 16:45:45 -07:00
Chet Haase
b713a15f09
am 8afd195d: am 6b313da0: Merge "Clarify behavior of fullscreen mode and softInputMode\'s adjustResize" into jb-mr2-dev
...
* commit '8afd195d47d2813822a388fbd0ea69228deafcf0':
Clarify behavior of fullscreen mode and softInputMode's adjustResize
2013-04-30 16:45:42 -07:00
Svetoslav
5473ffba40
am f6a2598f: Merge "Removing a debug check when logging fstrim events." into jb-mr2-dev
...
* commit 'f6a2598fc4a1595e9fb77bd542047a4c8006d337':
Removing a debug check when logging fstrim events.
2013-04-30 16:42:58 -07:00
Svetoslav
86fe273f26
am cff4b18e: Merge "Perform idle maintenance when the device is charging." into jb-mr2-dev
...
* commit 'cff4b18eeb35c832d0d48ca539ec722d9159ec70':
Perform idle maintenance when the device is charging.
2013-04-30 16:42:54 -07:00
Baligh Uddin
5bf93be4f4
am f0e8c78a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'f0e8c78a11c43f23ea314166707039e2c4b5361f':
Import translations. DO NOT MERGE
2013-04-30 16:42:36 -07:00
Chet Haase
8afd195d47
am 6b313da0: Merge "Clarify behavior of fullscreen mode and softInputMode\'s adjustResize" into jb-mr2-dev
...
* commit '6b313da0d89564711acfc8c66b7790da0f52d187':
Clarify behavior of fullscreen mode and softInputMode's adjustResize
2013-04-30 16:42:33 -07:00
Dmitry Shmidt
6fd43d2de1
am e1c09484: am ddf7a066: (-s ours) Merge "framework:When turn off of SoftAp immediately call turning ON SoftAp"
...
* commit 'e1c094842cf9b751f16df8f8baf65565a842e6ff':
framework:When turn off of SoftAp immediately call turning ON SoftAp
2013-04-30 16:26:42 -07:00
Dmitry Shmidt
e1c094842c
am ddf7a066: (-s ours) Merge "framework:When turn off of SoftAp immediately call turning ON SoftAp"
...
* commit 'ddf7a0660c456a975b12794c54fd6681e422ef29':
framework:When turn off of SoftAp immediately call turning ON SoftAp
2013-04-30 16:25:08 -07:00
Chet Haase
a934ad112c
Merge "Speed up user-switching wallpaper changes" into jb-mr2-dev
2013-04-30 22:42:53 +00:00
Jeff Sharkey
09aa0cf6f6
Merge "Better --unplugged support when dumping battery."
2013-04-30 22:14:12 +00:00
Chet Haase
b432ef98f0
Speed up user-switching wallpaper changes
...
Previous work in ImageWallpaper cached the bitmap for a user
to avoid reloading it (an expensive operation on large-display devices)
when we could simply re-use it. User switching still caused a reload, however,
since the place where we cache the bitmap (ImageWallpaper) is in an instance
that is re-created on user-switch.
A simple fix is to have the ImageWallpaper stop telling the WallpaperManager
to erase its own cache of the bitmap prior to re-loading it. That step is
unnecessary, since a bitmap that is cached can be assumed to be valid. A wallpaper
change will correctly null out that cached version, so if the cached bitmap
is non-null, then we can simply use it as-is.
The fix is to remove the call to forgetLoadedWallpaper() and allow the caching
mechanism to do its job.
Issue #7986933 user switching on lock screen is slow (sometimes like molasses)
Change-Id: I447754ab85337bc8ae59b4ad6c3e6c2b30e13735
2013-04-30 15:10:51 -07:00
Alan Viverette
52ae8e845e
am a7fa0079: am 561dcc58: Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev
...
* commit 'a7fa0079a7bf544f7f7b0828c00a9247c0c51bfe':
Avoid crash when TextToSpeech calls onInit() from the constructor.
2013-04-30 14:09:01 -07:00
Alan Viverette
a7fa0079a7
am 561dcc58: Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev
...
* commit '561dcc5823eec20c48d116531556b32e9de66f91':
Avoid crash when TextToSpeech calls onInit() from the constructor.
2013-04-30 14:04:13 -07:00
Dmitry Shmidt
ddf7a0660c
Merge "framework:When turn off of SoftAp immediately call turning ON SoftAp"
2013-04-30 20:59:11 +00:00
sunil duttu
aff3bd69d3
framework:When turn off of SoftAp immediately call turning ON SoftAp
...
Due to sub system restart,There is state change of softAp tether state machine
in tethered state triggering turnoff SoftAp this should be
follwed by turnon softap.
Change-Id: I93051f17bcaae72ae0694f1f23557cc1d3bea280
2013-04-30 13:56:17 -07:00
Jeff Sharkey
ec43a6bc17
Better --unplugged support when dumping battery.
...
Also fixes logBatteryStatsLocked() to output valid dump data, instead
of just a usage message.
Bug: 8708665
Change-Id: Ie0d8d90e1a470b7e1e902643333309c2cf7bdb72
2013-04-30 13:33:18 -07:00
Elliott Hughes
a5e5196bec
am 76c643c9: am e3f2735f: Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
...
* commit '76c643c9b600ef31c22f807c2874c879a7fa5069':
when locale is non-Enligh, sometimes month spinner needs a number IME
2013-04-30 13:23:17 -07:00
Romain Guy
0520146c41
am 55828af2: am 6628ee7a: Merge "HeaderViewListAdapter: Correct thrown error names."
...
* commit '55828af26ce0090c6c80a300d27d1064ce1b74c6':
HeaderViewListAdapter: Correct thrown error names.
2013-04-30 13:23:15 -07:00
Elliott Hughes
76c643c9b6
am e3f2735f: Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
...
* commit 'e3f2735fcfd8dafd226200d5cf219a6f82c9cc0c':
when locale is non-Enligh, sometimes month spinner needs a number IME
2013-04-30 13:21:22 -07:00
Romain Guy
55828af26c
am 6628ee7a: Merge "HeaderViewListAdapter: Correct thrown error names."
...
* commit '6628ee7a46a56cdc28d409e6fd74afc34bd24c5b':
HeaderViewListAdapter: Correct thrown error names.
2013-04-30 13:21:19 -07:00
Elliott Hughes
e3f2735fcf
Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
2013-04-30 20:11:50 +00:00
Elliott Hughes
31872fd7ce
am a99595a3: am afe56810: Merge "Fix DatePicker\'s spinner order in various locales."
...
* commit 'a99595a393341b6a130e202bc9e93848ee53057b':
Fix DatePicker's spinner order in various locales.
2013-04-30 12:17:27 -07:00
Elliott Hughes
ba8d2e58f8
am c2639e58: am 0bb4c701: Merge "Use ICU for getDateFormatOrder."
...
* commit 'c2639e58fa5724c06a1d910ad76aebed647b4ba2':
Use ICU for getDateFormatOrder.
2013-04-30 12:17:25 -07:00
Elliott Hughes
a99595a393
am afe56810: Merge "Fix DatePicker\'s spinner order in various locales."
...
* commit 'afe56810517a4ddfad125029ca04fd4cc5af2ef5':
Fix DatePicker's spinner order in various locales.
2013-04-30 12:15:06 -07:00
Elliott Hughes
c2639e58fa
am 0bb4c701: Merge "Use ICU for getDateFormatOrder."
...
* commit '0bb4c701bab0f69172417b7a511acb6bdfa052db':
Use ICU for getDateFormatOrder.
2013-04-30 12:15:00 -07:00
Romain Guy
6628ee7a46
Merge "HeaderViewListAdapter: Correct thrown error names."
2013-04-30 19:11:22 +00:00
Taylor H. Perkins
62b2bb80f6
HeaderViewListAdapter: Correct thrown error names.
...
When accessing an invalid entry of the list, an IndexOutOfBounds exception is thrown, not an ArrayIndexOutOfBounds exception.
Change-Id: I3cf59faab004fa6391d84f30f280e0c9bd92dc44
Signed-off-by: Taylor H. Perkins <taylorhp@gmail.com >
2013-04-30 12:04:52 -07:00
Romain Guy
4225d79656
Merge "Handle Surface::lock errors in TextureView Bug #8689535 "
2013-04-30 18:58:17 +00:00
Elliott Hughes
afe5681051
Merge "Fix DatePicker's spinner order in various locales."
2013-04-30 18:40:01 +00:00
Romain Guy
9e37d590a6
Merge "Fix TextClock documentation Bug #8670351 "
2013-04-30 18:31:29 +00:00
Romain Guy
53bacf5a91
Handle Surface::lock errors in TextureView
...
Bug #8689535
Change-Id: I6d16e13903a58e93940160e7656147656ab79982
2013-04-30 11:30:10 -07:00
Elliott Hughes
0bb4c701ba
Merge "Use ICU for getDateFormatOrder."
2013-04-30 18:22:18 +00:00
Romain Guy
09b1994c4d
Fix TextClock documentation
...
Bug #8670351
Change-Id: I87a906b85b51f44d9dcecb6f137db53886323ad7
2013-04-30 11:19:39 -07:00
Elliott Hughes
659f145278
Fix DatePicker's spinner order in various locales.
...
DatePicker always effectively uses yyyy MMM dd, so we need to ask
icu4c what order those should appear in for the user's locale. The
existing DateFormat code was an approximation that worked for en_US
but not for all languages (fa being one example).
Bug: 7207103
Change-Id: I7b12568dbc02522ebad6e1db5f8426109cd6f7ce
2013-04-30 11:11:53 -07:00
Elliott Hughes
edd6f9e688
Use ICU for getDateFormatOrder.
...
Bug: 7207103
Change-Id: I680bb727cb74cd4b050f237f036d9e696201fc0b
2013-04-30 11:09:53 -07:00
Svetoslav
f6a2598fc4
Merge "Removing a debug check when logging fstrim events." into jb-mr2-dev
2013-04-30 18:05:48 +00:00
Svetoslav
9e814a8c02
Removing a debug check when logging fstrim events.
...
This change is removing the check for debuggable build to
log fstrim events. While this was done everywhere else, one
place was overlooked.
bug:8688454
Change-Id: I354e1deebfd801f971dd91b9e7972c6ebfd093f3
2013-04-30 10:43:59 -07:00
Svetoslav
cff4b18eeb
Merge "Perform idle maintenance when the device is charging." into jb-mr2-dev
2013-04-30 17:41:21 +00:00
Romain Guy
f9aca99353
Merge "Prevent TextureView from ever setting a null layer paint"
2013-04-30 17:26:10 +00:00
Romain Guy
c2079c968d
Prevent TextureView from ever setting a null layer paint
...
Change-Id: If9a418b7eb9969410286df43ee805cd7d8ec17b2
2013-04-30 10:25:35 -07:00
Svetoslav
f23b64df94
Perform idle maintenance when the device is charging.
...
Added the precondition that the device should be charging to the
existing ones of the device not being used for awhile and the
battery level being high enough. Note that even if the device is
charging, we have to check the battery level since the user can
unplug it at any time.
bug:8688454
Change-Id: I709b1620571301743dc3504a6a625e2018951bfa
2013-04-30 10:19:53 -07:00
Kenny Root
178e8bbf25
am e9ae6822: resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp
...
* commit 'e9ae6822a80cb1f3bd13c785f1727c03d35da52e':
Track change to JSSE provider
2013-04-30 09:01:38 -07:00
John Reck
6a5a04ae66
am be53f180: am 28d91bdb: Merge "Revert "Can not mark the same content of browser page after copy""
...
* commit 'be53f1806cf9f0ec69f785a0063227e0ed795eb8':
Revert "Can not mark the same content of browser page after copy"
2013-04-30 09:01:35 -07:00
Kenny Root
590bca3b24
resolved conflicts for merge of 09ab7ef9 to master
...
Change-Id: I505317d0cde7a6daf0fd50b20cba21aa55693263
2013-04-30 09:00:14 -07:00
Irfan Sheriff
3ddee7d6e9
am fd0b0072: am 9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev
...
* commit 'fd0b0072db6d89c85a5ea20383a1c3dc289d1d38':
Remove scan notification dialog on wifi off
2013-04-30 08:54:22 -07:00
Nick Kralevich
b7294d74dd
am 5dc2ac4d: am 7318b840: am ec3396af: am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls
...
* commit '5dc2ac4d7b5fdc7d3c1d9c60c47ad654ca55738d':
libdrm: fix bad strncpy / snprintf calls
2013-04-30 08:54:18 -07:00