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

57263 Commits

Author SHA1 Message Date
Svetoslav
04e919ae6c am 2458c71c: am 8308a3cb: Merge "Fix app widget serices not being unbound." into lmp-dev 
* commit '2458c71c4774c8a1074f094d9e45bb2a41580219':
  Fix app widget serices not being unbound.
 2014-08-29 03:58:46 +00:00
George Mount
3a44b3f889 am f16343b7: am 2d53188b: Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 
* commit 'f16343b723656315cc51b9e3acb4c43d2263487e':
  Fix NPE when transitioning on unattached scene root.
 2014-08-29 03:12:00 +00:00
George Mount
c1cdf5dc3c am 202532da: am 48514832: Merge "Fix NPE when clicking "back" quickly." into lmp-dev 
* commit '202532dabd1ad1152721a192e6bb2587176a7d4c':
  Fix NPE when clicking "back" quickly.
 2014-08-29 03:11:54 +00:00
Svetoslav
fbf98e5f52 am 8308a3cb: Merge "Fix app widget serices not being unbound." into lmp-dev 
* commit '8308a3cb31c31b4587a91f02424ff0c1106bb1c0':
  Fix app widget serices not being unbound.
 2014-08-29 03:02:58 +00:00
Svetoslav
2635b7b0d3 Fix app widget serices not being unbound. 
bug:17321037

Change-Id: I44578df1104f9bd2e28700a3422a3323844d92c0
 2014-08-28 17:41:49 -07:00
George Mount
7b7499644c am 2d53188b: Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 
* commit '2d53188b2ed3950f4d1c7e5163ba181c83ea5c85':
  Fix NPE when transitioning on unattached scene root.
 2014-08-28 23:33:42 +00:00
George Mount
c07292aa90 am 48514832: Merge "Fix NPE when clicking "back" quickly." into lmp-dev 
* commit '48514832232eee579a1aab76d51c0adc8a36efc0':
  Fix NPE when clicking "back" quickly.
 2014-08-28 23:33:37 +00:00
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
George Mount
46a761db9a Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 2014-08-28 23:24:06 +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
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
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
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
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
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
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
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
Alan Viverette
40ce070714 Fix docs build 
Change-Id: Id7b961ebcfffe536992208a157f625b5a1b1e1b6
 2014-08-28 15:27:04 -07: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
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
PauloftheWest
2f2ea058db Merge "Updated SMS emphasis strings for Quantum/Material theme." into lmp-dev 2014-08-28 21:37:20 +00: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
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
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
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
PauloftheWest
768330d6d7 Updated SMS emphasis strings for Quantum/Material theme. 
Bug: 17148201
Change-Id: I888f366368c47bf42ef2aef55662c0a2b1bd382e
 2014-08-28 13:42:21 -07: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
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
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
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00
Winson Chung
19042f10fa am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 
* commit 'ef390cca57352e4284827981d39d6cb600b2811d':
  Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
 2014-08-28 19:38:45 +00:00