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

152355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raph Levien
ea6a04a0c0 am 91c3bb3a: am 0dc8c30d: Merge "Ignore width of trailing whitespace for computing ellipsis" into lmp-dev 
* commit '91c3bb3a6d60e45cec919ea46ddcd51f1b1151c6':
  Ignore width of trailing whitespace for computing ellipsis
 2014-08-28 23:26:24 +00:00
RoboErik
f82483ec1e am c14e2251: am 3c951d03: Merge "Add javadoc to Window.set/getMediaController" into lmp-dev 
* commit 'c14e2251b1fc4460134acd4b1a18815b19cc03e4':
  Add javadoc to Window.set/getMediaController
 2014-08-28 23:26:19 +00:00
Chris Craik
82e65f75e8 am 9bb831a6: am 79c09015: Merge "Support Z reorder/shadows in root render node" into lmp-dev 
* commit '9bb831a61ce738af3d5ed58d5cd6a3ef86a4c94a':
  Support Z reorder/shadows in root render node
 2014-08-28 23:26:14 +00:00
Alan Viverette
ce32e9adf7 am 474af791: am 3516cdb9: Merge "Fix docs build" into lmp-dev 
* commit '474af791266d0829a232bbb7738981e0679f2649':
  Fix docs build
 2014-08-28 23:11:43 +00:00
Eino-Ville Talvala
96722e12b9 am 7d3c202c: am 12dba4a6: Merge "Camera2: Make sure aborting captures on an idle device works." into lmp-dev 
* commit '7d3c202cda7cd4791213c36234ab011bd895272a':
  Camera2: Make sure aborting captures on an idle device works.
 2014-08-28 23:11:38 +00:00
Alan Viverette
0a838608c8 am 33f52f1e: am f104c2f9: Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 
* commit '33f52f1e6fba8b0cdcdefaff9bc8199f4021c48a':
  Cancel the date picker dialog when BUTTON_NEGATIVE is clicked
 2014-08-28 23:11:33 +00:00
Diego Pontoriero
350052ec9c am 0c39756f: am 2498df27: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 
* commit '0c39756f39b4098bdf8b3f391652046cc565018c':
  Change TelephonyManager method name to accurately reflect functionality.
 2014-08-28 23:11:29 +00:00
Raph Levien
28565a9e9b am 0dc8c30d: Merge "Ignore width of trailing whitespace for computing ellipsis" into lmp-dev 
* commit '0dc8c30d6f4a8e4cecd9ab0749497227e0f561e4':
  Ignore width of trailing whitespace for computing ellipsis
 2014-08-28 23:08:48 +00:00
RoboErik
6f2b2b0c2e am 3c951d03: Merge "Add javadoc to Window.set/getMediaController" into lmp-dev 
* commit '3c951d03435a6239d07ff1131db28c9f6f04c78b':
  Add javadoc to Window.set/getMediaController
 2014-08-28 23:08:44 +00:00
Chris Craik
067a7e4140 am 79c09015: Merge "Support Z reorder/shadows in root render node" into lmp-dev 
* commit '79c09015c031d441baabbd561b83c081c8015662':
  Support Z reorder/shadows in root render node
 2014-08-28 23:08:40 +00:00
Raph Levien
7de5c43c80 Merge "Ignore width of trailing whitespace for computing ellipsis" into lmp-dev 2014-08-28 22:59:08 +00:00
Jeff Sharkey
894ca05b21 am 2cf50caa: am babbcbb1: Merge "Lint tool for current.txt." into lmp-dev 
* commit '2cf50caa54168041f02c8283dfb344463a9edb18':
  Lint tool for current.txt.
 2014-08-28 22:57:41 +00:00
Jean-Michel Trivi
44409c8eb8 am d6e389e8: am 2d770004: Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 
* commit 'd6e389e830e3a9afd014303a61ec046e623b3a58':
  android.media.Ringtone: add getter for AudioAttributes
 2014-08-28 22:57:36 +00:00
Jean-Michel Trivi
5f815de2a6 am 1917d96b: am f9882022: Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 
* commit '1917d96b04d910027a90023d986130548a4f7ab1':
  More AudioManager.generateAudioSessionId() javadoc
 2014-08-28 22:57:31 +00:00
Alan Viverette
0b54ddb2e0 am 3516cdb9: Merge "Fix docs build" into lmp-dev 
* commit '3516cdb988bd365eba60c8561e4ef6dd6413ec89':
  Fix docs build
 2014-08-28 22:57:25 +00:00
RoboErik
97a3377dfe am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 
* commit '86e941e6b80481dba07731def3968f29c760c982':
  Update to MediaBrowser APIs per council feedback
 2014-08-28 22:57:25 +00:00
Eino-Ville Talvala
c1e3af4a14 am 12dba4a6: Merge "Camera2: Make sure aborting captures on an idle device works." into lmp-dev 
* commit '12dba4a61d37dd671dca5e89a76bd8af79e7c5e3':
  Camera2: Make sure aborting captures on an idle device works.
 2014-08-28 22:57:20 +00:00
Alan Viverette
9bf4abff3f am f104c2f9: Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 
* commit 'f104c2f997cac8c3f72573692b7457da3433c576':
  Cancel the date picker dialog when BUTTON_NEGATIVE is clicked
 2014-08-28 22:57:15 +00:00
Diego Pontoriero
1257799112 am 2498df27: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 
* commit '2498df27c4912ee32e08698a495fd238822cfb17':
  Change TelephonyManager method name to accurately reflect functionality.
 2014-08-28 22:57:10 +00:00
RoboErik
f87fcf9716 Merge "Add javadoc to Window.set/getMediaController" into lmp-dev 2014-08-28 22:56:08 +00:00
Chris Craik
6fc6014a24 Merge "Support Z reorder/shadows in root render node" into lmp-dev 2014-08-28 22:55:48 +00:00
RoboErik
fd63dd0ce2 Add javadoc to Window.set/getMediaController 
Fleshes out the javadoc a bit more instead of just a reference to
the description of the methods in Activity.

bug:17198774
Change-Id: I24afe1c5d9f2e46e201c84072a6b34a619867889
 2014-08-28 22:53:34 +00:00
Alan Viverette
76d149a587 Merge "Fix docs build" into lmp-dev 2014-08-28 22:51:48 +00:00
Eino-Ville Talvala
509f777730 Merge "Camera2: Make sure aborting captures on an idle device works." into lmp-dev 2014-08-28 22:48:55 +00:00
Alan Viverette
9adfa37cfe Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 2014-08-28 22:39:27 +00:00
Jeff Sharkey
023ba78335 am babbcbb1: Merge "Lint tool for current.txt." into lmp-dev 
* commit 'babbcbb1cca7cdf78f25e37b4a24b9dc8a0047c9':
  Lint tool for current.txt.
 2014-08-28 22:39:02 +00:00
PauloftheWest
971114a035 am 21fb99b8: am 7d91d9f1: Merge "Updated SMS emphasis strings for Quantum/Material theme." into lmp-dev 
* commit '21fb99b8b1e69bd5f6967a8689b004fec57cf496':
  Updated SMS emphasis strings for Quantum/Material theme.
 2014-08-28 22:39:02 +00:00
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