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

154256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
ed176f2e70 am 380946dd: am 7d3c202c: am 12dba4a6: Merge "Camera2: Make sure aborting captures on an idle device works." into lmp-dev 
* commit '380946dd18e8f6fb725e5b348c43bf7416843561':
  Camera2: Make sure aborting captures on an idle device works.
 2014-08-28 23:24:09 +00:00
George Mount
46a761db9a Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 2014-08-28 23:24:06 +00:00
Alan Viverette
9cc4bda235 am e9d79974: am 33f52f1e: am f104c2f9: Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 
* commit 'e9d79974a26ffd49eea25eaf03627eecec914349':
  Cancel the date picker dialog when BUTTON_NEGATIVE is clicked
 2014-08-28 23:24:04 +00:00
Diego Pontoriero
86b48ac335 am ca03ee0e: am 0c39756f: am 2498df27: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 
* commit 'ca03ee0ec5dcb451739ff6a0399a9e0caf9ecae3':
  Change TelephonyManager method name to accurately reflect functionality.
 2014-08-28 23:23:58 +00:00
George Mount
0f227c9a3d Merge "Fix NPE when clicking "back" quickly." into lmp-dev 2014-08-28 23:19:38 +00:00
George Mount
6276cd4b8d Fix NPE when transitioning on unattached scene root. 
Bug 17261558

Change-Id: Ib86c72e26f7fd9ac3fc47df650d95fdeeb43f1be
 2014-08-28 16:17:38 -07:00
Brian Carlstrom
7d86375b1e Merge "Change /dalvik-cache to be owned by root." 2014-08-28 23:17:04 +00:00
Jeff Sharkey
932a07cefe Teach API lint about package layering! 
Now it can identify layering violations, like when something deep in
android.os depends on android.app.

Change-Id: I94606c642195b3ed7558ff6979ed4a181cd85fa2
 2014-08-28 16:16:07 -07:00
George Mount
407d1fa52c Fix NPE when clicking "back" quickly. 
Bug 17319368

Change-Id: I8cf544aefa75bd5fe4f606e185f84977a36b0cdc
 2014-08-28 16:11:49 -07: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
John Reck
8d4c198a35 am f26df60e: Merge "Track buildLayer calls, destroy if unused" into lmp-dev 
* commit 'f26df60e4d7a586164bd535b1f86f7971a4f13b4':
  Track buildLayer calls, destroy if unused
 2014-08-28 23:08:53 +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
Jeff Sharkey
66f2025fdd am e238044d: am 2cf50caa: am babbcbb1: Merge "Lint tool for current.txt." into lmp-dev 
* commit 'e238044d68d5a51bb2c22a272938d9ee80eebef1':
  Lint tool for current.txt.
 2014-08-28 23:08:41 +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
Jean-Michel Trivi
12542f1757 am b49dfbef: am d6e389e8: am 2d770004: Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 
* commit 'b49dfbef478aeaf1f88056fe14a85970a9580f2d':
  android.media.Ringtone: add getter for AudioAttributes
 2014-08-28 23:08:36 +00:00
Jean-Michel Trivi
53f5106d9d am c7e083a5: am 1917d96b: am f9882022: Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 
* commit 'c7e083a5b83804737fc5d006853d93a3e44c760e':
  More AudioManager.generateAudioSessionId() javadoc
 2014-08-28 23:08:31 +00:00
RoboErik
d133303a5c am ab716047: am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 
* commit 'ab71604780c4cccf238e1c78b7b05310c4a49583':
  Update to MediaBrowser APIs per council feedback
 2014-08-28 23:08:20 +00:00
John Reck
80068b735e Merge "Track buildLayer calls, destroy if unused" into lmp-dev 2014-08-28 23:04:32 +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
PauloftheWest
3e6af6f9ac am 6ad1a15b: am 21fb99b8: am 7d91d9f1: Merge "Updated SMS emphasis strings for Quantum/Material theme." into lmp-dev 
* commit '6ad1a15bdbfd452098454d31ba22ecde3cad12b2':
  Updated SMS emphasis strings for Quantum/Material theme.
 2014-08-28 22:58:57 +00:00
RoboErik
674f89837b am 3b273101: am c4f63258: am b907b22f: Merge "Set/unset session on the callback" into lmp-dev 
* commit '3b2731011149b9688c181de048651345db446406':
  Set/unset session on the callback
 2014-08-28 22:58:52 +00:00
Winson Chung
985bcb05cf am 5f2d2764: am 5e3fa41f: am 2beddd4d: Merge "Ensuring that the ActivityInfo cache accounts for the task\'s user id. (Bug 17314317)" into lmp-dev 
* commit '5f2d2764c3bafd883992f07d569c490e1cd0cc13':
  Ensuring that the ActivityInfo cache accounts for the task's user id. (Bug 17314317)
 2014-08-28 22:58:46 +00:00
Alan Viverette
33d93c5be6 am 44cc7c8f: am 89dbc546: am dceb15b2: Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev 
* commit '44cc7c8f65ecf68b93f05df32b57028771e3fd3d':
  Update action bar item widths, overflow menu, button, and spinner styles
 2014-08-28 22:58:41 +00:00
Shaohan Zou
050d3554f9 am ae10d378: am 4dd1023d: am 77bc1cef: Merge "Add Media Player Streaming Tests" into lmp-dev 
* commit 'ae10d3788751c1af318c4c8be1a96b9657a4d9a7':
  Add Media Player Streaming Tests
 2014-08-28 22:58:36 +00:00
Christopher Tate
3d9c6e4ae8 am 06ccf6f7: am a618e54a: am 2c85f54f: Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 
* commit '06ccf6f7ff737239357133bda3fbc385707b43b0':
  Correct misleading javadoc for BackupHelper
 2014-08-28 22:58:31 +00:00
Chris Craik
626877a9ea am 75a65625: am a1590b87: am 7732c066: Merge "Force translucency for inset windows" into lmp-dev 
* commit '75a656254b2fa5818c20c67dfe1cd796de197500':
  Force translucency for inset windows
 2014-08-28 22:58:25 +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
John Reck
998a6d8189 Track buildLayer calls, destroy if unused 
Bug: 17208461

Change-Id: Ibdb104a493285d77a6891c5e74e38a52c7014da9
 2014-08-28 15:55:26 -07: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
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
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
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