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

154051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
5cd7f1649a am c4f63258: am b907b22f: Merge "Set/unset session on the callback" into lmp-dev 
* commit 'c4f632580993f71662329de010b2d6db4ac9c0b6':
  Set/unset session on the callback
 2014-08-28 22:38:58 +00:00
Jean-Michel Trivi
0008e75230 am 2d770004: Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 
* commit '2d770004425f3a9c831b84f9b0b4308aa72f4478':
  android.media.Ringtone: add getter for AudioAttributes
 2014-08-28 22:38:56 +00:00
Winson Chung
11e7d7a5bd am 5e3fa41f: am 2beddd4d: Merge "Ensuring that the ActivityInfo cache accounts for the task\'s user id. (Bug 17314317)" into lmp-dev 
* commit '5e3fa41f23f6bee75200e8700fd7febf71409009':
  Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)
 2014-08-28 22:38:53 +00:00
Jean-Michel Trivi
b1dd80a8c2 am f9882022: Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 
* commit 'f9882022be6bd2f44750807ff10b17fdde89797c':
  More AudioManager.generateAudioSessionId() javadoc
 2014-08-28 22:38:52 +00:00
Diego Pontoriero
921db7e1de Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 2014-08-28 22:38:50 +00:00
RoboErik
26023f4d63 am a70def9e: Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 
* commit 'a70def9e80f0acbfbec54aa76182901858d2188a':
  Update to MediaBrowser APIs per council feedback
 2014-08-28 22:38:47 +00:00
Alan Viverette
3d6fec1ac7 am 89dbc546: am dceb15b2: Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev 
* commit '89dbc546572ae9f5f18efe127df7eaf00e2c7787':
  Update action bar item widths, overflow menu, button, and spinner styles
 2014-08-28 22:38:45 +00:00
Shaohan Zou
19db1418fb am 4dd1023d: am 77bc1cef: Merge "Add Media Player Streaming Tests" into lmp-dev 
* commit '4dd1023def2243b4581813ed8e581455e3535978':
  Add Media Player Streaming Tests
 2014-08-28 22:38:40 +00:00
Jeff Sharkey
7f208bfcfd Merge "Lint tool for current.txt." into lmp-dev 2014-08-28 22:33:01 +00:00
Jeff Sharkey
8190f4885b Lint tool for current.txt. 
Detects common public API mistakes, making it easy to quickly scan
across all changes in a new API level.

Builds in-memory representation of the current API, then runs various
detectors over the classes.  It collects failures, and can ignore
known failures from a previous API level.

Example usage:

$ python frameworks/base/tools/apilint/apilint.py \
    frameworks/base/api/current.txt \
    prebuilts/sdk/api/21.txt

Change-Id: Ie1f88894baf9f79e4b11e78c47f848ea5e25fc25
 2014-08-28 15:31:35 -07:00
Alan Viverette
40ce070714 Fix docs build 
Change-Id: Id7b961ebcfffe536992208a157f625b5a1b1e1b6
 2014-08-28 15:27:04 -07:00
Jean-Michel Trivi
09daab204c Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 2014-08-28 22:13:11 +00:00
Jean-Michel Trivi
d33c3a7765 Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 2014-08-28 22:12:43 +00:00
Chris Craik
abedca3983 Support Z reorder/shadows in root render node 
bug:17310188
Change-Id: If2281218c458cf767d79b4d81944e2c8a23ca32c
 2014-08-28 15:03:55 -07:00
RoboErik
350be2e1c2 Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 2014-08-28 21:51:50 +00:00
PauloftheWest
2c0f3b8ad5 am 7d91d9f1: Merge "Updated SMS emphasis strings for Quantum/Material theme." into lmp-dev 
* commit '7d91d9f172038f03a271ec07c88f79ab0535c6ed':
  Updated SMS emphasis strings for Quantum/Material theme.
 2014-08-28 21:42:12 +00:00
RoboErik
e8a79a89b9 am b907b22f: Merge "Set/unset session on the callback" into lmp-dev 
* commit 'b907b22f67d866d9fc46d00b8a22714454c0cb6e':
  Set/unset session on the callback
 2014-08-28 21:42:09 +00:00
Winson Chung
fa09657c09 am 2beddd4d: Merge "Ensuring that the ActivityInfo cache accounts for the task\'s user id. (Bug 17314317)" into lmp-dev 
* commit '2beddd4d78f6028b4b32058bd48c1d7f5955e09f':
  Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)
 2014-08-28 21:42:05 +00:00
PauloftheWest
2f2ea058db Merge "Updated SMS emphasis strings for Quantum/Material theme." into lmp-dev 2014-08-28 21:37:20 +00:00
RoboErik
4fe4facb68 Merge "Set/unset session on the callback" into lmp-dev 2014-08-28 21:29:38 +00:00
RoboErik
5ea924bcdb Set/unset session on the callback 
We lost this somewhere. When a callback is set on a MediaSession it needs
to have a reference to the Session so it can do default routing of media
keys.

bug:17304614
Change-Id: I4af82947da790135049d40c5c69c2996f3cc4ccc
 2014-08-28 14:19:25 -07:00
Alan Viverette
9d139d2d8a am dceb15b2: Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev 
* commit 'dceb15b22ea3d229f29aec762b58c6ce06c4eca9':
  Update action bar item widths, overflow menu, button, and spinner styles
 2014-08-28 21:16:48 +00:00
Shaohan Zou
209dcc68f0 am 77bc1cef: Merge "Add Media Player Streaming Tests" into lmp-dev 
* commit '77bc1cefe5af85da8ef9e7f8fd9248b1ee335345':
  Add Media Player Streaming Tests
 2014-08-28 21:16:44 +00:00
Winson Chung
bb6c033351 Merge "Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)" into lmp-dev 2014-08-28 21:14:22 +00:00
Christopher Tate
fd5d43d09d am a618e54a: am 2c85f54f: Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 
* commit 'a618e54ac648fd9b161ee08cd102ae31a1de17f8':
  Correct misleading javadoc for BackupHelper
 2014-08-28 21:14:08 +00:00
Chris Craik
d05b3f8de7 am a1590b87: am 7732c066: Merge "Force translucency for inset windows" into lmp-dev 
* commit 'a1590b8765d1d2f3086dd807cce17955d670bc17':
  Force translucency for inset windows
 2014-08-28 21:13:53 +00:00
RoboErik
3625bf72cb Update to MediaBrowser APIs per council feedback 
Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.

bug:17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
 2014-08-28 21:11:22 +00:00
Alan Viverette
b1b267114c Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev 2014-08-28 21:05:04 +00:00
Christopher Tate
aa53436928 am 2c85f54f: Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 
* commit '2c85f54ff783957f889aa67ea9cd0e4a6d611ae9':
  Correct misleading javadoc for BackupHelper
 2014-08-28 21:03:24 +00:00
Chris Craik
7f2de62043 am 7732c066: Merge "Force translucency for inset windows" into lmp-dev 
* commit '7732c066f33c270ac48fdd5b1fb9438fb7260e82':
  Force translucency for inset windows
 2014-08-28 21:03:20 +00:00
Shaohan Zou
18b80d2a0d Merge "Add Media Player Streaming Tests" into lmp-dev 2014-08-28 21:00:33 +00:00
Kenny Guy
a734fc1ece Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317) 
Change-Id: I10bcb60abe3450f2ecfb3ee305be505e13e0be3b
 2014-08-28 13:58:29 -07:00
Alan Viverette
f023c2530a Update action bar item widths, overflow menu, button, and spinner styles 
Manually modifies the overflow button hotspot bounds so that the ripple
appears to be centered on the overflow icon. Adds styleable and parsing
for list popup window offsets. Updates spinner text appearance to be
consistent with drop down item text appearance. Also updates horizontal
inner padding in buttons.

BUG: 17305079
BUG: 17304391
BUG: 17302567
Change-Id: Iafddfef290078de968894a3b443ba9f60f84c6d4
 2014-08-28 13:55:18 -07:00
Christopher Tate
a43e2409ad Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 2014-08-28 20:53:36 +00:00
Diego Pontoriero
3892fc0349 Change TelephonyManager method name to accurately reflect functionality. 
Bug: 17163860
Change-Id: I4390d79c49831454146a42b89520a16984c5f260
 2014-08-28 13:50:36 -07:00
Chris Craik
12b500959d Merge "Force translucency for inset windows" into lmp-dev 2014-08-28 20:49:06 +00:00
PauloftheWest
768330d6d7 Updated SMS emphasis strings for Quantum/Material theme. 
Bug: 17148201
Change-Id: I888f366368c47bf42ef2aef55662c0a2b1bd382e
 2014-08-28 13:42:21 -07:00
John Spurlock
c3b52b0bf6 am af1f2882: am e22aa0f8: am 6b7a237e: Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev 
* commit 'af1f28823b92d15d0d31d02e6fe91ffb42bdc201':
  StatusBar: Allow roaming indicator even when also on wifi.
 2014-08-28 20:23:14 +00:00
John Spurlock
e4bb6b324b am e22aa0f8: am 6b7a237e: Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev 
* commit 'e22aa0f8ddb69d845513d086846cf2ae57b793b5':
  StatusBar: Allow roaming indicator even when also on wifi.
 2014-08-28 20:10:41 +00:00
Julia Reynolds
5fd5d461d2 am e7472cec: am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 
* commit 'e7472cec1f01174c6dfdbbbd1287dcde56c1a21e':
  Audio/Micrphone user restriction/multiuser updates.
 2014-08-28 20:10:38 +00:00
Dianne Hackborn
d5b4d7a40a am 2575d022: am c297cc71: am f63aa97c: Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 
* commit '2575d022baf42e0945750703ccc7e5adb65e2009':
  Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
 2014-08-28 20:10:33 +00:00
Julia Reynolds
9130ae4501 am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 
* commit 'fa39108f4a59e96915d9efbddd2548d49611745d':
  Audio/Micrphone user restriction/multiuser updates.
 2014-08-28 20:01:16 +00:00
Dianne Hackborn
85facfc1b7 am c297cc71: am f63aa97c: Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 
* commit 'c297cc71d1382b3a492087d64205ebe6f13b164a':
  Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
 2014-08-28 20:01:12 +00:00
John Spurlock
b581c097e6 am 6b7a237e: Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev 
* commit '6b7a237ea55548689664c589b1bb5a205e7538a6':
  StatusBar: Allow roaming indicator even when also on wifi.
 2014-08-28 19:58:56 +00:00
Raph Levien
26c87cfb58 Ignore width of trailing whitespace for computing ellipsis 
We used the full width of a line, including trailing spaces, to compute
ellipsis, sometimes causing spurious ellipsization when the space pushed
it past the layout width. This patch uses only the width up to the last
graphing character.

Fix for bug 17186801 "First line of title text is getting truncated even
if there's space on second line"

Change-Id: I49d07c18c8dd1d3b279f591224d23e10645dc8c0
 2014-08-28 12:56:51 -07:00
Winson Chung
dd014e73bf am 4eade477: am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit '4eade477fb2c2159afafe047e867007a986ad43c':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:51:08 +00:00
Julia Reynolds
abe3347950 am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 
* commit 'd266bd44dcf79b14584a3af223d78fe80c4d571a':
  Audio/Micrphone user restriction/multiuser updates.
 2014-08-28 19:46:08 +00:00
Dianne Hackborn
6dd49811ce am f63aa97c: Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 
* commit 'f63aa97c6a7ed27ff99044a09562601d08fedd73':
  Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
 2014-08-28 19:46:01 +00:00
John Spurlock
1a3febe711 Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev 2014-08-28 19:45:53 +00:00
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00