Craig Mautner
c66a83751a
Merge "Do not return to Home activity if not top task."
2013-05-01 18:32:33 +00:00
Craig Mautner
a1c12b2cae
Merge "Move task methods into TaskRecord."
2013-05-01 18:32:06 +00:00
Craig Mautner
7085759954
Merge "A better fix for bug 8740202."
2013-05-01 18:31:31 +00:00
Craig Mautner
9e14d0fd9a
Do not return to Home activity if not top task.
...
Add a test for being the top task when closing the last activity in a
task. Without this test, if the last activity in a task was flagged to
return to the home activity on completion but that activity had
launched a new task we would not go to the new task but would instead
launch the home activity.
Fixes bug 8775949.
Change-Id: I7fd9d9ebbdbff8064d894407c35190894a141ecf
2013-05-01 11:26:09 -07:00
gcondra@google.com
da1bb7cdbf
am 334c04e2: am bb1a6244: Merge "Fix an NPE and fd leak in SELinux policy updater." into jb-mr2-dev
...
* commit '334c04e2f0eb62c6c9db73da0ec0021abffceb92':
Fix an NPE and fd leak in SELinux policy updater.
2013-05-01 11:15:38 -07:00
gcondra@google.com
334c04e2f0
am bb1a6244: Merge "Fix an NPE and fd leak in SELinux policy updater." into jb-mr2-dev
...
* commit 'bb1a6244d169bbbf06068b5dce47c51c98097c89':
Fix an NPE and fd leak in SELinux policy updater.
2013-05-01 11:14:06 -07:00
repo sync
bb1a6244d1
Merge "Fix an NPE and fd leak in SELinux policy updater." into jb-mr2-dev
2013-05-01 18:12:04 +00:00
Baligh Uddin
2e29cdae53
Merge "Import translations. DO NOT MERGE"
2013-05-01 16:21:45 +00:00
Baligh Uddin
01ad25eb8e
Merge "Import translations. DO NOT MERGE"
2013-05-01 16:20:16 +00:00
Baligh Uddin
918200edf7
Import translations. DO NOT MERGE
...
Change-Id: Ia6b724bc2426c4248b3b83569f21dd0ffe91bb3a
Auto-generated-cl: translation import
2013-05-01 08:45:23 -07:00
Baligh Uddin
4946128d64
Import translations. DO NOT MERGE
...
Change-Id: I247665db04a208df5ea3681001855b1321341a55
Auto-generated-cl: translation import
2013-05-01 08:18:40 -07:00
Baligh Uddin
4431de13bb
Import translations. DO NOT MERGE
...
Change-Id: I5f6ba8997fc6d041d18e6c2103cc3c0fc7d83ee8
Auto-generated-cl: translation import
2013-05-01 08:17:11 -07:00
Jesse Hall
fcafc3259e
am 0b30ad53: am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev
...
* commit '0b30ad53423a9bfab53b1632a33159be3d82e3df':
Fix GLES30 JNI registration
2013-04-30 19:38:14 -07:00
Jesse Hall
0b30ad5342
am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev
...
* commit '09f3cc2bcca62fea30dc0f22cc120088e9f54728':
Fix GLES30 JNI registration
2013-04-30 19:36:03 -07:00
Jesse Hall
09f3cc2bcc
Merge "Fix GLES30 JNI registration" into jb-mr2-dev
2013-05-01 02:31:55 +00:00
Romain Guy
e72bd54302
am fa4eb085: am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436 " into jb-mr2-dev
...
* commit 'fa4eb085c3f01c0b659c37be585c13f0a9a3b360':
Prevent TextureView from ever setting a null layer paint Bug #8760436
2013-04-30 18:19:34 -07:00
Romain Guy
fa4eb085c3
am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436 " into jb-mr2-dev
...
* commit 'b107b7e9ecaee799a7a18b8ab897969ef554fd9b':
Prevent TextureView from ever setting a null layer paint Bug #8760436
2013-04-30 18:16:11 -07:00
Romain Guy
b107b7e9ec
Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436 " into jb-mr2-dev
2013-05-01 01:14:41 +00:00
Christopher Tate
9f9dc4b230
am 6e629e84: am 95a9bfe2: When installing/enabling a system app, bootstrap it
...
* commit '6e629e84c52c870ff6fe6d0493861997929209f4':
When installing/enabling a system app, bootstrap it
2013-04-30 17:50:50 -07:00
Christopher Tate
6e629e84c5
am 95a9bfe2: When installing/enabling a system app, bootstrap it
...
* commit '95a9bfe2ba75d79fff8157ed57e75c4ffb5a08ac':
When installing/enabling a system app, bootstrap it
2013-04-30 17:48:59 -07:00
Christopher Tate
95a9bfe2ba
When installing/enabling a system app, bootstrap it
...
Specifically, send it a BOOT_COMPLETED broadcast just as it would have
received during device (or user) startup.
Bug 8594153
Change-Id: I847c16df56d038a25758e594f951bc15348edc19
2013-04-30 17:40:32 -07:00
repo sync
f7b8bc48af
Fix an NPE and fd leak in SELinux policy updater.
...
Bug: 8769213
Change-Id: Iff80be6109a1586d818754c8f9f5053b816fbd57
2013-04-30 17:37:00 -07:00
Casey Burkhardt
d9ad188a18
am dd7d8ec1: am 203aa72e: Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev
...
* commit 'dd7d8ec17ec1129f33764e025366129d3562ea7e':
Rebuilds ActionBar accessibility description as needed
2013-04-30 17:26:14 -07:00
Casey Burkhardt
dd7d8ec17e
am 203aa72e: Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev
...
* commit '203aa72e747794a64a8262ceb6c9cdc8381e77cb':
Rebuilds ActionBar accessibility description as needed
2013-04-30 17:20:12 -07:00
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
Casey Burkhardt
203aa72e74
Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev
2013-05-01 00:15:44 +00: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
Casey Burkhardt
8452a7f2f6
Rebuilds ActionBar accessibility description as needed
...
Previously, ActionBarView only updated the contentDescription for the navigate
up/home affordance when it is enabled or disabled. This causes that description
to be rebuilt and applied whenever the title or subtitle of the view is changed.
This also inadvertantly removes whitespace in ActionBarView.
Bug: 8757286
Change-Id: I1ea02cad20e0d5c0c57d071727cc647c4dd52d44
2013-04-30 16:05:56 -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