Jim Miller
e7b6b1aae7
Merge "Hide fingerprint API until new API is ready" into lmp-dev
2014-08-26 22:02:52 +00:00
Christoph Studer
cd4adf8b5e
NoMan: Fix inconsistent notification comparator
...
Switch second phase of notification sorting to lexicographic
string comparison in order to enforce a consistent comparison.
Note that this slightly changes the logic: Within groups we
previously fell back on authoritative rank comparison when
one of the notificiations didn't have a sort key. Now we
just replace missing sort keys with " ".
Bug: 16626175
Change-Id: I91f4f4afeeb2c8edda6cd2668011a7367795086c
2014-08-26 23:56:27 +02:00
Alan Viverette
ed6f14a20c
Make shadow alpha properties public, add lighting values for TV
...
BUG: 17189722
BUG: 17221975
Change-Id: I4ed477b658fec96ce69fa278f67345dab6bacaa3
2014-08-26 14:53:28 -07:00
Chris Craik
b34eeb70a6
Merge "Notify VM of native pixelref allocations" into lmp-dev
2014-08-26 21:47:46 +00:00
Baligh Uddin
b0bc142653
Import translations. DO NOT MERGE
...
Change-Id: Ie9641c36b244cf85d9a5d17b2185f7c26d1b4ec3
Auto-generated-cl: translation import
2014-08-26 14:32:15 -07:00
Jeff Sharkey
7837dac462
Merge "Report FileBridge failures as wtf()." into lmp-dev
2014-08-26 21:27:11 +00:00
vandwalle
7aea15a08e
Merge "remove passpoint - DO NOT MERGE" into lmp-dev
2014-08-26 21:26:42 +00:00
Baligh Uddin
07fda0f834
Import translations. DO NOT MERGE
...
Change-Id: I27a436ec79e63ccadcf9315bfa179a86fe519bbf
Auto-generated-cl: translation import
2014-08-26 14:25:05 -07:00
Jeff Sharkey
d3ca991700
Report FileBridge failures as wtf().
...
Bug: 17183379
Change-Id: Ifd4dc690c04439e1f7abebd8e0ca4e1ff97d9cc8
2014-08-26 14:23:28 -07:00
Baligh Uddin
65bc2b09d3
Import translations. DO NOT MERGE
...
Change-Id: I605546fc701703baebd8e91bb6cc198223eb6c3c
Auto-generated-cl: translation import
2014-08-26 14:18:45 -07:00
Christoph Studer
f50d82a1e4
Merge "NoMan: Cancel children when update removes summary" into lmp-dev
2014-08-26 21:17:18 +00:00
Christoph Studer
faa9957fd3
Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev
2014-08-26 21:16:22 +00:00
Christoph Studer
6b6e9e05d3
Merge "Notification: Optimize L icon processing" into lmp-dev
2014-08-26 21:15:27 +00:00
Christoph Studer
7f05a69637
Merge "SysUI: Uprank current media notification" into lmp-dev
2014-08-26 21:14:16 +00:00
Jay Shrauner
f196e3fe45
Merge "Fix NPE when have no phone accounts" into lmp-dev
2014-08-26 21:04:33 +00:00
Baligh Uddin
25f6868665
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-26 21:03:36 +00:00
Baligh Uddin
cb54f6dfff
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-26 21:03:27 +00:00
Jay Shrauner
7746a94fd6
Fix NPE when have no phone accounts
...
Return empty List instead of null so calling functions don't throw NPE
when dereferencing return value.
Bug:17282683
Bug:17262485
Change-Id: Ica4952b11a8af28787a4a0b6a991ab888386aa7b
2014-08-26 21:01:18 +00:00
Sungsoo Lim
9dd43afbb9
Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS
...
Bug: 16948874
Change-Id: If44aaa7085705e8a2f55c71dae61bf6ac0cdfc09
2014-08-26 13:56:42 -07:00
vandwalle
242540d9ea
Merge "add radio stats to link layer" into lmp-dev
2014-08-26 20:46:19 +00:00
Jae Seo
ff9ec7779a
Merge "TIF: Make TV content rating names consistent" into lmp-dev
2014-08-26 20:32:03 +00:00
Jeff Sharkey
264a5f5b34
Merge "Treat moving app as installing in new location." into lmp-dev
2014-08-26 20:29:13 +00:00
Libin.Tang@motorola.com
c47b18fb25
IMS: modify sendDtmf interface.
...
Bug: 17282921
Change-Id: If96f209e91db420e089d429bb5c7a0f9882b4057
2014-08-26 20:15:33 +00:00
Chris Craik
4cd7dbc90f
Notify VM of native pixelref allocations
...
bug:17178931
Change-Id: I0de22bb0d2ae8233d392b7e222f72391aaa12ce8
2014-08-26 13:10:33 -07:00
Adam Lesinski
1dc0f36401
Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev
2014-08-26 20:09:07 +00:00
Paul Jensen
5b62d263a7
Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev
2014-08-26 20:09:00 +00:00
Dianne Hackborn
4610545dd2
Merge "Fix issue #16311398 : Limit number of documents a process can open" into lmp-dev
2014-08-26 19:56:26 +00:00
Michael Wright
15741d0e0b
Merge "Add missing attr for KEYCODE_VOICE_ASSIST" into lmp-dev
2014-08-26 19:42:40 +00:00
Adam Lesinski
9d9607527f
Split up ComponentName in UsageEvents.Event
...
Some events in the future may not have originated
from a class, so we shouldn't be using ComponentName.
Bug:17259858
Change-Id: Id7fe3245b91596cf27ae4ec51655602f01665622
2014-08-26 12:41:31 -07:00
Adam Lesinski
27046c88bf
Merge "Add indexOf method to ArrayMap & ArraySet" into lmp-dev
2014-08-26 19:38:04 +00:00
Ji-Hwan Lee
56bfc2bc24
Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev
2014-08-26 19:20:46 +00:00
Calin Juravle
4db289eb54
Merge "Make native bridge property read-only." into lmp-dev
2014-08-26 19:18:24 +00:00
Calin Juravle
d68f83cc47
Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev
2014-08-26 19:10:25 +00:00
Selim Gurun
790f6f449d
Merge "Remove synchronized from acceptThirdPartyCookies()" into lmp-dev
2014-08-26 19:09:48 +00:00
Calin Juravle
685a12b446
Make native bridge property read-only.
...
Bug: 17104449
(cherry picked from commit 53db6ae7819177abb9df156b269726a69a8c72df)
Change-Id: I926356f1e472a20d571e40c0c7dbb9c5a66a44a9
2014-08-26 20:07:51 +01: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
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
Andrew Solovay
3442b412e1
am 8d8cf0b2: am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs
...
* commit '8d8cf0b22f9f8eaf06914697fbe22a77cb27e307':
docs: Fixed error in code sample.
2014-08-26 18:47:25 +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
Diego Pontoriero
c9256d3da1
Merge "Remove unused constant from TelephonyIntents." into lmp-dev
2014-08-26 18:36:41 +00:00
Andrew Solovay
8d8cf0b22f
am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs
...
* commit 'e7c7993e4d490b67b329ef2502e35c8aad763ca1':
docs: Fixed error in code sample.
2014-08-26 18:36:23 +00:00
Andrew Solovay
e7c7993e4d
Merge "docs: Fixed error in code sample." into klp-modular-docs
2014-08-26 18:25:33 +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
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