drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
181,263 Commits 1 Branch 0 Tags
Commit Graph

181263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raph Levien
4319827fd4 am 61ff4d1d: am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 
automerge: c36d373

* commit 'c36d373733b8fb9683d40e404151110ed9c44ecf':
  Use constants instead of resources for ellipsis.
 2015-01-29 23:29:04 +00:00
Raph Levien
c36d373733 am 61ff4d1d: am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 
* commit '61ff4d1debe013e9f81bb05f59356b133b6e4922':
  Use constants instead of resources for ellipsis.
 2015-01-29 23:25:14 +00:00
Raph Levien
61ff4d1deb am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 
* commit 'd24047dcfed3fb7c913a0a5950c9f48ce3d49b9e':
  Use constants instead of resources for ellipsis.
 2015-01-29 23:17:01 +00:00
Raph Levien
d24047dcfe Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 2015-01-29 23:04:15 +00:00
Igor Viarheichyk
6f9f1d4b3b Use constants instead of resources for ellipsis. 
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.

(cherry-pick of ed0daa93e48d38e54a7ad1c99c461510a4c07599.)

Bug: 18542179
Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
 2015-01-29 15:00:13 -08:00
Zhen Yu Song
72c85bbdf8 Merge "+ Add CarExtender to Notification Bug: 18316420" 2015-01-29 22:54:29 +00:00
Jinsuk Kim
1b68ce327a am 7bf039b6: am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
automerge: a6fc42a

* commit 'a6fc42aec58ab0d2dbb96f37d40e597bc39631fa':
  CEC: Discard key event to itself
 2015-01-29 22:46:33 +00:00
Jinsuk Kim
a6fc42aec5 am 7bf039b6: am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
* commit '7bf039b67c89ac07a1b90d048bf1e4ff0e121ab8':
  CEC: Discard key event to itself
 2015-01-29 22:44:51 +00:00
Jinsuk Kim
b744db8715 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 
automerge: 7e79bdb

* commit '7e79bdb494b51175d9873f82f4ca8488ac6fccfa':
  CEC: Do null/empty check against the parameter for checkRecordSource()
 2015-01-29 22:41:23 +00:00
Jinsuk Kim
7bf039b67c am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
* commit '9c5ccc3684e55e0ce7f2940bd13dfd7acdf85895':
  CEC: Discard key event to itself
 2015-01-29 22:39:57 +00:00
Jinsuk Kim
f0569c1651 am 1ebbe916: am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 
automerge: e7ff01e

* commit 'e7ff01ecc5c0ceda498dd476cb29ee663f1968dc':
  CEC: Add CEC device upon receiving <Report Physical Address>
 2015-01-29 22:39:52 +00:00
Raph Levien
98cb80d659 am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 
automerge: 35b5780

* commit '35b5780ec52f3492ae41c36ae30e289bcf78cb11':
  Refine resolution order for typeface and fontFamily
 2015-01-29 22:38:41 +00:00
Jinsuk Kim
7e79bdb494 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 
* commit 'eb2c4a07a118bb6f41455ffd14f35086298675cd':
  CEC: Do null/empty check against the parameter for checkRecordSource()
 2015-01-29 22:37:01 +00:00
Jinsuk Kim
e7ff01ecc5 am 1ebbe916: am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 
* commit '1ebbe9165842707fd575ea61b8158463f93c35be':
  CEC: Add CEC device upon receiving <Report Physical Address>
 2015-01-29 22:36:55 +00:00
Raph Levien
35b5780ec5 am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 
* commit '2ed9a7e5ac3923b9459dc02b3a04e075ae4ea627':
  Refine resolution order for typeface and fontFamily
 2015-01-29 22:36:46 +00:00
Jinsuk Kim
9c5ccc3684 Merge "CEC: Discard key event to itself" into lmp-mr1-dev 2015-01-29 22:33:43 +00:00
Jinsuk Kim
454fab5219 CEC: Discard key event to itself 
Should discard keyevents if the target address is the device itself.

Bug: 19188660
Change-Id: Id47d79c996f60c9d90540f28c4b2509976d2f378
 2015-01-30 07:28:10 +09:00
Zhen Yu Song
9d5528ba9f + Add CarExtender to Notification 
Bug: 18316420

Change-Id: Idd7a06c2271d62c603014038fbe5a0bbacb0ed78
 2015-01-29 14:27:28 -08:00
Jinsuk Kim
eb2c4a07a1 am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 
* commit 'dbdaea0c6d44ead142f42ac060af2f5cd7f942ac':
  CEC: Do null/empty check against the parameter for checkRecordSource()
 2015-01-29 22:26:01 +00:00
Jinsuk Kim
1ebbe91658 am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 
* commit '3f923474248e24706e7977a7512b0a35cff835a7':
  CEC: Add CEC device upon receiving <Report Physical Address>
 2015-01-29 22:25:57 +00:00
Raph Levien
2ed9a7e5ac am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 
* commit 'af461e12a12dba8fc544fa373831368ba2c18096':
  Refine resolution order for typeface and fontFamily
 2015-01-29 22:25:51 +00:00
Jinsuk Kim
dbdaea0c6d Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 2015-01-29 22:22:31 +00:00
Jinsuk Kim
3f92347424 Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 2015-01-29 22:21:54 +00:00
Raph Levien
af461e12a1 Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 2015-01-29 22:11:00 +00:00
Soonil Nagarkar
9f74b337b0 Merge "Fix FusionEngine so it isn't confused by location providers enabling/disabling." 2015-01-29 21:58:55 +00:00
Sanket Padawe
81f63a60f3 am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 
automerge: f19485b

* commit 'f19485b644b7ba7bda1f5c7a2279ca56c37923f0':
  Suppress logging to avoid showing phone no.
 2015-01-29 21:57:29 +00:00
Sanket Padawe
f19485b644 am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 
* commit '60e4edfb94fd744001b4c7013a89ef4abb311f97':
  Suppress logging to avoid showing phone no.
 2015-01-29 21:56:04 +00:00
Sanket Padawe
60e4edfb94 am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 
* commit '5df10e1842606f9a9a829a4779bf8f610b2d7bd9':
  Suppress logging to avoid showing phone no.
 2015-01-29 21:47:42 +00:00
Sanket Padawe
5df10e1842 Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev 2015-01-29 21:44:05 +00:00
Mike Lockwood
51936d4260 Merge "UsbAlsaManager: Don't reselect current USB audio device on all USB disconnects" 2015-01-29 21:33:32 +00:00
Mike Lockwood
61c9b44ca9 Merge "MidiManager: Add USB peripheral MIDI support" 2015-01-29 21:15:08 +00:00
Mike Lockwood
2a57bc7fd6 MidiManager: Add USB peripheral MIDI support 
This allows the android device to appear as a USB MIDI device to
a USB host (like a Mac or a PC) using the f_midi USB gadget driver.

Change-Id: I14f1ba73bcce2c894e77efb8810beac4ffe246d8
 2015-01-29 12:59:28 -08:00
John Reck
49bc4acfad resolved conflicts for merge of fe5ac4fc to master 
Change-Id: I6c0cc82db14b56297586469f940e408c0e218b3b
 2015-01-29 12:53:38 -08:00
Raph Levien
42b3024efd Refine resolution order for typeface and fontFamily 
Previously any fontFamily value on a TextView would override a typeface
value, even if the fontFamily is from a TextAppearance (for example,
from the theme) and the typeface is explicitly set. This patch changes
the resolution order to fontFamily set directly on the TextView,
typeface set directly on the TextView, fontFamily from TextAppearance,
typeface from TextAppearance.

Bug: 16154223
Change-Id: I45c1e511fba8f64eb236200e3fa2e885c02b59dc
 2015-01-29 12:49:19 -08:00
John Reck
fe5ac4fc31 am 5f3e21ce: am 6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev 
* commit '5f3e21cebeecf042e8e18a5021b3965415d9ff60':
  Allow ~Layer() to happen after onGLContextDestroyed
 2015-01-29 20:28:08 +00:00
John Reck
5f3e21cebe am 6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev 
* commit '6efc3ac6d2094c72b6a2e288101a5349b017274d':
  Allow ~Layer() to happen after onGLContextDestroyed
 2015-01-29 20:18:58 +00:00
John Reck
6efc3ac6d2 Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev 2015-01-29 20:13:05 +00:00
Jon Larimer
293b7b4fe5 am 3ac22f7a: am 49127bdd: am 0312d2ff: am 320f505e: am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58 
* commit '3ac22f7a386317ed4affe5bca0406501726ddb73':
 2015-01-29 20:03:25 +00:00
Jon Larimer
44f389c4f9 am ca04fca5: (-s ours) am eb56f7a5: am 4c2a6fdd: am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 
* commit 'ca04fca501aa1b3ca979bd860bb722ba3e3e0662':
 2015-01-29 20:03:21 +00:00
Jon Larimer
3ac22f7a38 am 49127bdd: am 0312d2ff: am 320f505e: am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58 
* commit '49127bddaf29c725f0cbdfe53f33e37afdd3da9f':
 2015-01-29 19:56:45 +00:00
Jon Larimer
ca04fca501 am eb56f7a5: am 4c2a6fdd: am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s o 
* commit 'eb56f7a5dc66cb0ca54afd25a9d089e7931512df':
 2015-01-29 19:56:40 +00:00
Jon Larimer
49127bddaf am 0312d2ff: am 320f505e: am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58 
* commit '0312d2ff45d895260f0995fc784bea706bd4f13d':
 2015-01-29 19:51:08 +00:00
Jon Larimer
eb56f7a5dc am 4c2a6fdd: am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours 
* commit '4c2a6fddb10a8b4c00391d54371aaa14f5d901ce':
 2015-01-29 19:51:05 +00:00
Jon Larimer
0312d2ff45 am 320f505e: am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58 
* commit '320f505ed52f8970b08eb93766af831de0332415':
 2015-01-29 19:46:00 +00:00
Jon Larimer
4c2a6fddb1 am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours 
* commit '64bdf77d9515f587f31998b614e524c26b2415a4':
 2015-01-29 19:45:56 +00:00
Jon Larimer
320f505ed5 am 52fba8d1: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 automerge: bebfd58 
* commit '52fba8d13428665fde405ef91857c00f0d399610':
 2015-01-29 19:38:51 +00:00
Jon Larimer
64bdf77d95 am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours 
* commit '8bb65246f2655fae8d807db973c5eaeff78733cc':
 2015-01-29 19:38:48 +00:00
Jon Larimer
52fba8d134 am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge: ea63fd7 
automerge: bebfd58

* commit 'bebfd58604ae8a70c08056f3a5cd9289b27fe11c':
 2015-01-29 19:30:57 +00:00
Jon Larimer
8bb65246f2 am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours 
automerge: 6fe42f0  -s ours

* commit '6fe42f08702a0773c0dd2aad2d41c54f73bb057b':
 2015-01-29 19:29:31 +00:00
Sanket Padawe
14d21344d2 Suppress logging to avoid showing phone no. 
Bug: 19193581
Change-Id: I6ee17a2eab9d0ed84c931d6395a5aeb148177f95
 2015-01-29 11:21:34 -08:00