Diego Pontoriero
8293adbe17
am 363f8fd0: am 1b3c0f25: Merge "Remove unused constant from TelephonyIntents." into lmp-dev
...
* commit '363f8fd0188b76018b9cedaa8626082d07c5e48d':
Remove unused constant from TelephonyIntents.
2014-08-26 19:04:40 +00:00
Amith Yamasani
1771d39ebf
Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev
2014-08-26 19:02:18 +00:00
Svetoslav
e39baa7307
Merge "Fix accessiblity CTS tests (framework)." into lmp-dev
2014-08-26 19:01:50 +00:00
Baligh Uddin
2d1d387d3f
Import translations. DO NOT MERGE
...
Change-Id: Iac6630d0b618bc97f0bb62047cee97a797c52df7
Auto-generated-cl: translation import
2014-08-26 11:57:30 -07:00
Adam Lesinski
e12ee81137
am 85a006d7: am 806d4cfb: am 521edf85: Merge "Have R classes generate their own reference rewrite logic" into lmp-dev
...
* commit '85a006d758765266984a912841a13503b49ea665':
Have R classes generate their own reference rewrite logic
2014-08-26 18:54:15 +00:00
Winson Chung
04b0cd61a3
am 927754d7: am 77b91f7d: am 319b4b57: Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev
...
* commit '927754d79665a95e1945640e2f618450f3475395':
Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)
2014-08-26 18:54:06 +00:00
Adam Lesinski
4e9c07c0de
Add indexOf method to ArrayMap & ArraySet
...
Getting the indexOf is useful for doing compound operations
like:
int i = set.indexOf(key);
if (i >= 0) {
Object o = set.valueAt(i);
o.blah();
set.removeAt(i);
}
Change-Id: I3d4b77d1461ba969fc6b4d332d52d4d084b5b53c
2014-08-26 11:53:32 -07:00
Jorim Jaggi
6183cc1a68
Merge "Update IME switcher icon" into lmp-dev
2014-08-26 18:51:08 +00:00
Diego Pontoriero
a2f95d814d
am 1b3c0f25: Merge "Remove unused constant from TelephonyIntents." into lmp-dev
...
* commit '1b3c0f25bef103e9b5cefccb49e3b1a121fdedc6':
Remove unused constant from TelephonyIntents.
2014-08-26 18:47:10 +00:00
Jorim Jaggi
31fc3e8047
Update IME switcher icon
...
Also make the transparency consistent with the other icons.
Bug: 15597889
Change-Id: Ia5c8ea0bed192b57c552c62358b365d979c4b062
2014-08-26 20:42:38 +02:00
Adam Lesinski
448c076d33
am 806d4cfb: am 521edf85: Merge "Have R classes generate their own reference rewrite logic" into lmp-dev
...
* commit '806d4cfb2a06a01be4a58ff25a55797d9140b917':
Have R classes generate their own reference rewrite logic
2014-08-26 18:42:24 +00:00
Winson Chung
c46977c508
am 77b91f7d: am 319b4b57: Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev
...
* commit '77b91f7d87a9994348364a912d3127be2595d5ed':
Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)
2014-08-26 18:42:19 +00:00
Jorim Jaggi
63ccdd2281
am f0ad37bb: am 3181d2ab: am ac87c0b3: Merge "Fix jumping animation when using two-finger expand" into lmp-dev
...
* commit 'f0ad37bb4e229f46af350c3f23977331af611ca8':
Fix jumping animation when using two-finger expand
2014-08-26 18:42:09 +00:00
ztenghui
8abc808479
am 9b7e3ef5: am acd21c96: am fadaa2cb: Merge "Correctly detect the wrong Z value for the light" into lmp-dev
...
* commit '9b7e3ef5bc00552939b544eacef7e6568cdeb1cd':
Correctly detect the wrong Z value for the light
2014-08-26 18:42:04 +00:00
ztenghui
45406d0218
am e86b590e: am 624b50cf: am 07856605: Merge "VD: Update the fillColor default as transparent" into lmp-dev
...
* commit 'e86b590ec4b15d3e7e00d47c848fb92b5b6038be':
VD: Update the fillColor default as transparent
2014-08-26 18:42:00 +00:00
Georgi Nikolov
4943340a0b
am de1ee2fa: am 6f7beb16: am 172d3b87: Merge "Add maximum time-out to sync operation" into lmp-dev
...
* commit 'de1ee2fa43d18a1bd877c382e15164f692968bde':
Add maximum time-out to sync operation
2014-08-26 18:41:53 +00:00
Georgi Nikolov
32f7d677c2
am f1b18b44: am ee461b92: am 67a86862: Merge "Don\'t back-off ALREADY_IN_PROGRESS syncs" into lmp-dev
...
* commit 'f1b18b44e777bcae40308b8e6170ddf31f464480':
Don't back-off ALREADY_IN_PROGRESS syncs
2014-08-26 18:41:48 +00:00
Diego Pontoriero
c9256d3da1
Merge "Remove unused constant from TelephonyIntents." into lmp-dev
2014-08-26 18:36:41 +00:00
Jorim Jaggi
933df210e2
am 3181d2ab: am ac87c0b3: Merge "Fix jumping animation when using two-finger expand" into lmp-dev
...
* commit '3181d2abbd3f39d2d9d2f881716b6dd0d8465d09':
Fix jumping animation when using two-finger expand
2014-08-26 18:31:41 +00:00
ztenghui
a0b6f1c236
am acd21c96: am fadaa2cb: Merge "Correctly detect the wrong Z value for the light" into lmp-dev
...
* commit 'acd21c96a5c7734d3fd949b0ccbba3b910e48d95':
Correctly detect the wrong Z value for the light
2014-08-26 18:31:37 +00:00
ztenghui
7e313bb933
am 624b50cf: am 07856605: Merge "VD: Update the fillColor default as transparent" into lmp-dev
...
* commit '624b50cf4da5a5c33dded850dc4756576e8c1084':
VD: Update the fillColor default as transparent
2014-08-26 18:31:26 +00:00
Georgi Nikolov
97f3d7e093
am 6f7beb16: am 172d3b87: Merge "Add maximum time-out to sync operation" into lmp-dev
...
* commit '6f7beb160567d261f3b4da285d2f5bbfd2b43919':
Add maximum time-out to sync operation
2014-08-26 18:31:22 +00:00
Georgi Nikolov
be8dad1c63
am ee461b92: am 67a86862: Merge "Don\'t back-off ALREADY_IN_PROGRESS syncs" into lmp-dev
...
* commit 'ee461b92a20137c05bc7065a71d188b2e80b69df':
Don't back-off ALREADY_IN_PROGRESS syncs
2014-08-26 18:31:17 +00:00
Adam Lesinski
4526cdec74
am 521edf85: Merge "Have R classes generate their own reference rewrite logic" into lmp-dev
...
* commit '521edf850799fd484ef2c363aed23ac8729240be':
Have R classes generate their own reference rewrite logic
2014-08-26 18:29:46 +00:00
Winson Chung
6a327bedfc
am 319b4b57: Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev
...
* commit '319b4b571c71a6943ff3a63154c873511ae01d87':
Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)
2014-08-26 18:29:41 +00:00
Jorim Jaggi
2cb0ebf7f7
am ac87c0b3: Merge "Fix jumping animation when using two-finger expand" into lmp-dev
...
* commit 'ac87c0b3236517bacc244fc270dc0da92f3487b8':
Fix jumping animation when using two-finger expand
2014-08-26 18:24:59 +00:00
ztenghui
a44a0aa9ae
am fadaa2cb: Merge "Correctly detect the wrong Z value for the light" into lmp-dev
...
* commit 'fadaa2cb5e82046eb3c5a1b3458108f12e6cc376':
Correctly detect the wrong Z value for the light
2014-08-26 18:24:48 +00:00
ztenghui
eaa532425c
am 07856605: Merge "VD: Update the fillColor default as transparent" into lmp-dev
...
* commit '07856605a8001697ff50371b39ecd0cd4480fd57':
VD: Update the fillColor default as transparent
2014-08-26 18:24:43 +00:00
Adam Lesinski
3aa6076083
Merge "Have R classes generate their own reference rewrite logic" into lmp-dev
2014-08-26 18:23:57 +00:00
Winson Chung
5c1b42e4f5
Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev
2014-08-26 18:23:10 +00:00
Jorim Jaggi
b0768f6ad0
Merge "Fix jumping animation when using two-finger expand" into lmp-dev
2014-08-26 18:21:31 +00:00
Georgi Nikolov
cc6a91e0c7
am 172d3b87: Merge "Add maximum time-out to sync operation" into lmp-dev
...
* commit '172d3b876310b20bc5b627a344ea51148dc39c7b':
Add maximum time-out to sync operation
2014-08-26 18:19:05 +00:00
Georgi Nikolov
015dcf6573
am 67a86862: Merge "Don\'t back-off ALREADY_IN_PROGRESS syncs" into lmp-dev
...
* commit '67a8686203779cdfb158a41fda28290dd6134154':
Don't back-off ALREADY_IN_PROGRESS syncs
2014-08-26 18:18:58 +00:00
ztenghui
bed17d21b0
Merge "Correctly detect the wrong Z value for the light" into lmp-dev
2014-08-26 18:18:31 +00:00
ztenghui
ae82e604fa
Merge "VD: Update the fillColor default as transparent" into lmp-dev
2014-08-26 18:18:16 +00:00
Dianne Hackborn
89ad456ea4
Fix issue #16311398 : Limit number of documents a process can open
...
In application processes, monitor for when we start getting close
to the Dalvik heap limit, and ask the activity manager to try to
prune old activity instances in that case.
Add an explicit API for apps to ask that they have their own
activity instances cleaned up, if they want.
Fix some bugs in launching activities that were not correctly
applying the "multi task" behavior in the appropriate situations
of document-centric recents.
Clean up the activity manager's process removal code to all share
a common path.
Add a new "Spam" option to ActivityTests, which continually creates
new tasks, checking that the activity manager will now prune old
tasks rather than letting the app run out of RAM.
And while I was was doing this, I found problems with the path
for bringing an empty task to the foreground -- it could make
a new task instead of re-starting the root activity in the
existing task. This is fixed, and some code in the recents
UI for working around the bug is removed.
And as long as I am doing that, we now have nice hooks in to
the activity manager for AppTask to give some APIs for better
managing the task, so add those along with more tests for these
APIs in ActivityTests.
We should look at also having the activity manager try to prune
old tasks when it sees app processes being killed, to better balance
memory use across multiple processes when some processes may host
many documents. That however is for another CL...
Change-Id: I2bb81c3f92819350c868c7a7470b35817eb9bea9
2014-08-26 11:16:59 -07:00
Georgi Nikolov
ffc596bd22
Merge "Add maximum time-out to sync operation" into lmp-dev
2014-08-26 18:16:54 +00:00
Georgi Nikolov
1877924da0
Merge "Don't back-off ALREADY_IN_PROGRESS syncs" into lmp-dev
2014-08-26 18:13:14 +00:00
Craig Mautner
45251b7af1
am ef904fb0: am 3750a055: am 7018ec68: Merge "Remove redundant call to window manager addTask()" into lmp-dev
...
* commit 'ef904fb076145e27d84e8ff35fe54dd4c356c3e4':
Remove redundant call to window manager addTask()
2014-08-26 18:04:41 +00:00
Diego Pontoriero
04154bcd91
Remove unused constant from TelephonyIntents.
...
Bug: 16457806
Change-Id: Ia987c3167e5731a1eceb6b1ff4a8795ced826a5d
2014-08-26 10:58:57 -07:00
Ji-Hwan Lee
d0f0058883
TIF: Reset main TvView only for explicit reset() call
...
Or, do not reset when it's called internaly while tuning.
Bug: 17269010
Change-Id: I3447ef0e628c066f71eee5a1416347fa6c721504
2014-08-27 02:55:10 +09:00
Baligh Uddin
f425b67838
Import translations. DO NOT MERGE
...
Change-Id: I816554657548e769500ab2a392bb48d9bc7d83f8
Auto-generated-cl: translation import
2014-08-26 10:53:52 -07:00
Craig Mautner
b089c41533
am 3750a055: am 7018ec68: Merge "Remove redundant call to window manager addTask()" into lmp-dev
...
* commit '3750a055b5f29b0d9bfe364672e28c9ac7aa86c2':
Remove redundant call to window manager addTask()
2014-08-26 17:52:17 +00:00
Baligh Uddin
1494447e35
Import translations. DO NOT MERGE
...
Change-Id: I0787124e2a6bf24f406c9b89770bdbfb5b801325
Auto-generated-cl: translation import
2014-08-26 10:48:38 -07:00
ztenghui
3bd3fa1f1d
Correctly detect the wrong Z value for the light
...
b/17221975
Change-Id: I2b46da95ad12ca5260d7fe9514a75558b6b6393b
2014-08-26 10:45:27 -07:00
Baligh Uddin
3cf491483a
Import translations. DO NOT MERGE
...
Change-Id: I5ebce437cb8cfc11bc608632a84c7ea3c12b72f7
Auto-generated-cl: translation import
2014-08-26 10:45:15 -07:00
Christoph Studer
f4a03919a7
am aaf6453e: am f1b13aee: am 1fe25a6f: Merge "SysUI: Force L+ status bar icons to white" into lmp-dev
...
* commit 'aaf6453ea54f04ef38702fa014dfbb5f7f5f5e85':
SysUI: Force L+ status bar icons to white
2014-08-26 17:44:20 +00:00
Baligh Uddin
397ca90661
Import translations. DO NOT MERGE
...
Change-Id: Ie191b1750a02be1a7aecbe110fa3720dc6cd0e61
Auto-generated-cl: translation import
2014-08-26 10:43:12 -07:00
Craig Mautner
ca0e070fea
am 7018ec68: Merge "Remove redundant call to window manager addTask()" into lmp-dev
...
* commit '7018ec68207e0a009b9410a09027a2823a29dd3d':
Remove redundant call to window manager addTask()
2014-08-26 17:38:54 +00:00
Christoph Studer
e76edacf32
am f1b13aee: am 1fe25a6f: Merge "SysUI: Force L+ status bar icons to white" into lmp-dev
...
* commit 'f1b13aeeb19d4b5a891d74dc0d7501944228e775':
SysUI: Force L+ status bar icons to white
2014-08-26 17:34:02 +00:00