57329 Commits

Author SHA1 Message Date
Adam Lesinski
d6fe30be04 am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev
* commit 'b616b94b63b91d17140a31ef65fa26cb261a67f4':
  Revert "Make UsageStats API comply with API Council"
2014-08-29 20:05:14 +00:00
Adam Lesinski
5e71b3fa90 am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev
* commit '247e8e84ec0cafcac7f5e686b68ff64cebf7272a':
  Revert "Make UsageStats API comply with API Council"
2014-08-29 19:56:52 +00:00
Adam Lesinski
25b09837d1 Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 2014-08-29 19:42:43 +00:00
Adam Lesinski
df77a40d40 Revert "Make UsageStats API comply with API Council"
This reverts commit 3811dabe57a60e4729f67b6fdc7fbe91eb8b3e06.

Did not update current.txt

Change-Id: I93faccaf24570b1ce88ade37c00506c4a48a8a1d
2014-08-29 19:34:09 +00:00
Adam Lesinski
d57e1cb644 am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev
* commit 'f5e3785e6fc2d4dcbc8ce72ad871a96421ca1f1d':
  Make UsageStats API comply with API Council
2014-08-29 19:21:28 +00:00
Yin-Chia Yeh
fc90ddcf92 am b3ff5477: am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev
* commit 'b3ff5477cd4d72631551bac81c543ed74179eda3':
  Camera2: Remove spurious warnings
2014-08-29 19:07:02 +00:00
Igor Murashkin
80bcba6413 am e24c71fd: am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev
* commit 'e24c71fd133ba2564e84b4d171689a48f37c070a':
  camera2: Implement TotalCaptureResult#getPartialResults
2014-08-29 19:06:57 +00:00
John Reck
b46c52209f am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev
* commit '724fff2034e17c601a3787792f8fb73172862c18':
  Listener callbacks ordering fixups
2014-08-29 19:06:53 +00:00
Adam Lesinski
fc66c98750 am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev
* commit '84b95b6634be81d9368f13c38ab86d28f591c478':
  Make UsageStats API comply with API Council
2014-08-29 19:06:29 +00:00
Adam Lesinski
a496b1a7f3 Merge "Make UsageStats API comply with API Council" into lmp-dev 2014-08-29 18:56:24 +00:00
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
Yohei Yukawa
4bf61aa61e am 7046f79e: am bbee6beb: Merge "Reject request when any unknown flag is speficied" into lmp-dev
* commit '7046f79ec9c9b0510af0f541f0e135b8a1ad4f5d':
  Reject request when any unknown flag is speficied
2014-08-29 18:50:18 +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
Yin-Chia Yeh
74df3591a5 am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev
* commit '4c99af79c66ce92bee559fd160df75d09cdb90ee':
  Camera2: Remove spurious warnings
2014-08-29 18:09:32 +00:00
Igor Murashkin
d76275c4b3 am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev
* commit '0a843da82f421032af9b05447013d9aaf67f1fee':
  camera2: Implement TotalCaptureResult#getPartialResults
2014-08-29 18:09:27 +00:00
John Reck
12bfad8dd9 am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev
* commit 'ff6feadefb5fa002a80fd70a5ae7b527f72eef5a':
  Listener callbacks ordering fixups
2014-08-29 18:09:22 +00:00
Yin-Chia Yeh
3e294e9921 Merge "Camera2: Remove spurious warnings" into lmp-dev 2014-08-29 18:02:50 +00:00
Igor Murashkin
0d1227d8b9 Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 2014-08-29 18:00:39 +00:00
John Reck
7da70ed6a5 Merge "Listener callbacks ordering fixups" into lmp-dev 2014-08-29 17:59:24 +00:00
John Reck
4d2c47206a Listener callbacks ordering fixups
Bug: 17228458
Bug: 17317816

Ensure that onStart is called prior to onCancel/onFinished if those
happen prior to the UI-thread handled start delay.

Ensure that onFinished is called if cancel/end is called

Change-Id: I23c16ea1c4f925d59d41ec5281d62dfc0c38595b
2014-08-29 10:40:56 -07:00
Yin-Chia Yeh
d47699a47a Camera2: Remove spurious warnings
It is valid if all compenents of a synthetic key are null.
Don't warn in that case.

Bug: 17300101

Change-Id: Ifacf2fb56d1272b33a2b1ae377a85c9011e22b24
2014-08-29 17:39:30 +00:00
Lorenzo Colitti
b4497fdc90 am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev
* commit '8a44b09de35285f6f02430442a2a62a11563e366':
  Really remove NetworkBoundURLFactory.
2014-08-29 17:15:44 +00:00
Lorenzo Colitti
e37679b27d Merge "Really remove NetworkBoundURLFactory." into lmp-dev 2014-08-29 16:54:20 +00:00
Jorim Jaggi
b30c615ff2 am 99a9436c: Merge "Fix various problems with notification layouts" into lmp-dev
* commit '99a9436c4f76e00750e62d180e48644ea2e60a83':
  Fix various problems with notification layouts
2014-08-29 14:00:51 +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
0ecef43e39 am 245eaa25: Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev
* commit '245eaa25b3c9349660a6e24cd2d0e46a7b3381b4':
  Fixing android.text.format.Time for non-English locales
2014-08-29 13:49:03 +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 788cb18f652fca380acefdadce305415bc0602b0)

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
Yohei Yukawa
0f93377382 am bbee6beb: Merge "Reject request when any unknown flag is speficied" into lmp-dev
* commit 'bbee6bebdc6d03eb3202c3c4e63e42473be98edc':
  Reject request when any unknown flag is speficied
2014-08-29 09:19:14 +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
8178edfc09 Merge "Fixing android.text.format.Time for non-English locales" 2014-08-29 08:27:30 +00:00
Yohei Yukawa
1728879d9c Merge "Reject request when any unknown flag is speficied" into lmp-dev 2014-08-29 08:22:58 +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
Yohei Yukawa
72d35fa829 Reject request when any unknown flag is speficied
Currently EditableInputConnection#requestUpdateCursorAnchorInfo
never returns false unless InputMethodManager is somehow
unavailable.

This is problematic, especifially when we add a new flag to
EditableInputConnection#requestUpdateCursorAnchorInfo in a
future release.

With this CL, #requestUpdateCursorAnchorInfo does nothing and
immediately returns false when one ore more unknown bits are
specified.

BUG: 17324806
Change-Id: I5601714b481e8efa0ad3337c0d093cfcf55eade3
2014-08-29 00:57:19 -07:00
Jeff Sharkey
232802e0e5 am f1ddfd1e: Keep tests building.
* commit 'f1ddfd1ea8773c409a3541f279f1d3c87e010f9c':
  Keep tests building.
2014-08-29 07:36:48 +00:00
Jeff Sharkey
73a8217803 Keep tests building.
Bug: 17183379
Change-Id: I7f52af3201975e8c626a6c6d7f508fd8d006b204
2014-08-29 00:10:14 -07:00
Jeff Sharkey
4b21cb68d7 am 78c14368: Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev
* commit '78c14368eaceaa625a7bad91b6a2718670d1309e':
  FileBridge needs to keep strong reference to PFD.
2014-08-29 07:00:54 +00: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
3e3a7a4c08 am cffbcb8a: Merge "Address API review comments" into lmp-dev
* commit 'cffbcb8aa117177b24c1395e728c0afc53d64882':
  Address API review comments
2014-08-29 06:29:12 +00:00
Sandeep Siddhartha
503a102143 Merge "Address API review comments" into lmp-dev 2014-08-29 06:22:08 +00:00
Terry Heo
8a67d3f8e3 am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev
* commit 'd3f234629ac7d693ced141ade1941d726aa453cd':
  CEC: Implement dump() of HdmiControlService
2014-08-29 05:22:21 +00:00