Commit Graph

40150 Commits

Author SHA1 Message Date
Lorenzo Colitti
f97b6bfb21 am 64e6f01f: am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev
* commit '64e6f01ff36bdfd6ba58436c35701d68ad174790':
  Really remove NetworkBoundURLFactory.
2014-08-29 18:52:37 +00:00
Jorim Jaggi
2c71e55706 am 2157b125: am 99a9436c: Merge "Fix various problems with notification layouts" into lmp-dev
* commit '2157b125c0071f27500ae0e69bd21588027c0b3b':
  Fix various problems with notification layouts
2014-08-29 18:51:04 +00:00
Jeff Sharkey
01e7bc6e6c am bb50b0b4: am f1ddfd1e: Keep tests building.
* commit 'bb50b0b4f3f7b738317cf905c7ef6274e89828c7':
  Keep tests building.
2014-08-29 18:50:08 +00:00
Jeff Sharkey
670feb4a76 am fc5b41eb: am 78c14368: Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev
* commit 'fc5b41eb8ef68686f49ed2b455fa25928e86a3f6':
  FileBridge needs to keep strong reference to PFD.
2014-08-29 18:49:57 +00:00
Sandeep Siddhartha
80e8b901b3 am efe6c903: am cffbcb8a: Merge "Address API review comments" into lmp-dev
* commit 'efe6c9032d1a1463aeda62e034c7fe42db5866e9':
  Address API review comments
2014-08-29 18:49:40 +00:00
Terry Heo
2966c8689d am b2357d5a: am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev
* commit 'b2357d5aabf85fa1b36036024e53da7dab416815':
  CEC: Implement dump() of HdmiControlService
2014-08-29 18:49:09 +00:00
Adam Powell
3db557537a am 41d34328: am ae806d87: Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev
* commit '41d34328b8b85d67a754687bd4e7570cdd4e8846':
  Doc improvements for new Toolbar changes, now with attributes.
2014-08-29 18:48:52 +00:00
Adam Powell
60aa53f71b am 1ae3bf17: am cbed634a: Merge "Don\'t add title margins during to Toolbar layout if titles don\'t fit" into lmp-dev
* commit '1ae3bf177d3ad86071ed7183511ef05ee57c6dcf':
  Don't add title margins during to Toolbar layout if titles don't fit
2014-08-29 18:48:44 +00:00
Adam Powell
06086bc31e am 32e9145c: am 31192ba8: Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev
* commit '32e9145c929ba740e3fce91cc495a97a538a9c37':
  Add xml attributes to Toolbar for navigation icon
2014-08-29 18:48:38 +00:00
Lorenzo Colitti
e37679b27d Merge "Really remove NetworkBoundURLFactory." into lmp-dev 2014-08-29 16:54:20 +00:00
Jorim Jaggi
e11ac78ccd Merge "Fix various problems with notification layouts" into lmp-dev 2014-08-29 13:51:23 +00:00
Neil Fuller
7e19fb0d69 Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev 2014-08-29 13:36:02 +00:00
Jorim Jaggi
d05aa3ee47 Fix various problems with notification layouts
- Fix end padding for inbox notification.
- Fix that actions in BigText were clipped off.
- Fix that second line was never shown.
- Fix top padding in combination with badges.
- Fix that actions in InboxStyle were clipped off.
- Make badge style consistent with small icon.
- Fix that third line on Inbox/BigText is always 12sp (before it was
  sometimes 14sp)

Bug: 17315502
Bug: 17285898
Bug: 17311783
Bug: 17200814
Change-Id: Ic7e5e4fa07b6302a76631d0238b88239871acf49
2014-08-29 15:26:50 +02:00
Neil Fuller
16566656cd Fixing android.text.format.Time for non-English locales
The test fixes for bug 17262063 showed up a real issue for
non-English locales with the Time.format() method:
If the Android string resources that contain the pattern use
non-ASCII characters then a '?' would be output instead of
those characters.

For example, in France the pattern for '%c' includes a 'à'
(a with a grave accent) and Japan includes 日.

The problem was due to converting the pattern to bytes using
the US_ASCII character set, which turns non-ASCII characters
into '?'. The code has been changed to use char throughout
and avoid bytes.

Internal documentation has been improved.

Some calls to modifyAndAppend() have been replaced with a
direct call to outputBuilder.append() because the
modify step is guaranteed to a no-op for the literals given.

The formatter has been changed to use Locale.US because it
is only used for outputting numbers. It has been renamed
to make this more obvious and the locale field has been
removed.

Bug: 17262063

(cherry picked from commit 788cb18f65)

Change-Id: I96ee158fbeb01827f0bbf022631625416f872fdb
2014-08-29 14:10:35 +01:00
Neil Fuller
a4bf544991 am 23f6a4ab: am 8178edfc: Merge "Fixing android.text.format.Time for non-English locales"
* commit '23f6a4ab5df4c7e156947f5324be8ae86f7c74fd':
  Fixing android.text.format.Time for non-English locales
2014-08-29 11:40:05 +00:00
Neil Fuller
23f6a4ab5d am 8178edfc: Merge "Fixing android.text.format.Time for non-English locales"
* commit '8178edfc096e797917257c8cbc715f0a31fe551a':
  Fixing android.text.format.Time for non-English locales
2014-08-29 09:16:50 +00:00
Neil Fuller
788cb18f65 Fixing android.text.format.Time for non-English locales
The test fixes for bug 17262063 showed up a real issue for
non-English locales with the Time.format() method:
If the Android string resources that contain the pattern use
non-ASCII characters then a '?' would be output instead of
those characters.

For example, in France the pattern for '%c' includes a 'à'
(a with a grave accent) and Japan includes 日.

The problem was due to converting the pattern to bytes using
the US_ASCII character set, which turns non-ASCII characters
into '?'. The code has been changed to use char throughout
and avoid bytes.

Internal documentation has been improved.

Some calls to modifyAndAppend() have been replaced with a
direct call to outputBuilder.append() because the
modify step is guaranteed to a no-op for the literals given.

The formatter has been changed to use Locale.US because it
is only used for outputting numbers. It has been renamed
to make this more obvious and the locale field has been
removed.

Bug: 17262063
Change-Id: I32b92f7f7e3e6931d3514d87f1d9a38f136d4021
2014-08-29 09:08:47 +01:00
Jeff Sharkey
73a8217803 Keep tests building.
Bug: 17183379
Change-Id: I7f52af3201975e8c626a6c6d7f508fd8d006b204
2014-08-29 00:10:14 -07:00
Jeff Sharkey
c62f2e1bb7 Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev 2014-08-29 06:52:55 +00:00
Sandeep Siddhartha
503a102143 Merge "Address API review comments" into lmp-dev 2014-08-29 06:22:08 +00:00
Terry Heo
97bf45464c Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev 2014-08-29 05:12:57 +00:00
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
Jeff Sharkey
9a1507aa10 FileBridge needs to keep strong reference to PFD.
Even though we've grabbed the underlying FD, the PFD could be GC'ed
and when finalized it would end up closing the underlying FD.  This
fix ties the PFD object lifecycle to the returned OutputStream.

Bug: 17183379
Change-Id: Ibee8f4cf78fee357181a250d15f2a653294b2877
2014-08-28 20:38:10 -07: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
Adam Powell
f825e0c561 Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev 2014-08-29 02:49:47 +00:00
Adam Powell
d760249623 Doc improvements for new Toolbar changes, now with attributes.
Change-Id: I3f67899b4f9ab9ae4ab4f5dcbc853c08d7867947
2014-08-28 19:35:36 -07:00
Adam Powell
b051ef62af Merge "Don't add title margins during to Toolbar layout if titles don't fit" into lmp-dev 2014-08-29 02:26:24 +00:00
Adam Powell
0c1dc53e74 Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev 2014-08-29 02:25:49 +00:00
Adam Powell
4c9765a654 Don't add title margins during to Toolbar layout if titles don't fit
When all space is consumed in a Toolbar by other views the special
shared title/subtitle margins shouldn't be added to the running
position during layout.

Bug 17253638

Change-Id: I179fcbf286fa68fd8df6e25bb1879bccbf1532ed
2014-08-28 19:21:18 -07:00
Lorenzo Colitti
32e520ed61 Really remove NetworkBoundURLFactory.
The code using it was removed, but the file itself was not.

Bug: 17112978
Change-Id: I35bc254fd3a5e7b19297b959c7310e7054ab77e1
2014-08-28 18:31:18 -07:00
Adam Powell
7c13bc2a70 Add xml attributes to Toolbar for navigation icon
...to match the existing setters/getters.

Change-Id: I9814c5d7f2aa0559c93fbb74881e29064473f186
2014-08-28 18:19:59 -07:00
Svetoslav
2635b7b0d3 Fix app widget serices not being unbound.
bug:17321037

Change-Id: I44578df1104f9bd2e28700a3422a3323844d92c0
2014-08-28 17:41:49 -07: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
7de5c43c80 Merge "Ignore width of trailing whitespace for computing ellipsis" into lmp-dev 2014-08-28 22:59:08 +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