Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,246 Commits 3 Branches 0 Tags
4ec4f8f0096f89555a2e09fcb3fa05286038e208
Commit Graph

40667 Commits

Author SHA1 Message Date
Yin-Chia Yeh
4ec4f8f009 am 3c505dae: am b3ff5477: am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev 
* commit '3c505dae125b34483b9173401cb2fe84c86e2485':
  Camera2: Remove spurious warnings
 2014-08-29 20:33:43 +00:00
Igor Murashkin
c57a88c631 am b99ecc40: am e24c71fd: am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 
* commit 'b99ecc40ee77f14ca46e8eaf3484bfc8e3721233':
  camera2: Implement TotalCaptureResult#getPartialResults
 2014-08-29 20:33:38 +00:00
John Reck
f8d104eed8 am 05b4e21e: am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev 
* commit '05b4e21ecda890ca20381384a772b4f7d66157a5':
  Listener callbacks ordering fixups
 2014-08-29 20:33:33 +00:00
Lorenzo Colitti
99dbe39234 am 96ec882b: am 64e6f01f: am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev 
* commit '96ec882ba17f542b42b1da453325b8dba9ce67f2':
  Really remove NetworkBoundURLFactory.
 2014-08-29 19:15:49 +00:00
Jorim Jaggi
ff44e803ad am 8219f7cc: am 2157b125: am 99a9436c: Merge "Fix various problems with notification layouts" into lmp-dev 
* commit '8219f7cc7e2fd3e623d8e14260ab720197952c3b':
  Fix various problems with notification layouts
 2014-08-29 19:15:22 +00:00
Jeff Sharkey
2c653e1a53 am a841cead: am bb50b0b4: am f1ddfd1e: Keep tests building. 
* commit 'a841ceadd9940b8349e49e35693e31918977f29e':
  Keep tests building.
 2014-08-29 19:14:51 +00:00
Jeff Sharkey
9928f2b62a am f751f4d6: am fc5b41eb: am 78c14368: Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev 
* commit 'f751f4d60cc8dae6741f826ec2d959a01fc51f82':
  FileBridge needs to keep strong reference to PFD.
 2014-08-29 19:14:43 +00:00
Sandeep Siddhartha
7f31f82432 am 601d017c: am efe6c903: am cffbcb8a: Merge "Address API review comments" into lmp-dev 
* commit '601d017c2209f0a7930503a0bc97b4e762e4e8a1':
  Address API review comments
 2014-08-29 19:14:33 +00:00
Terry Heo
e5e1d6da5f am 1f0736a0: am b2357d5a: am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev 
* commit '1f0736a064e2911a5ad76f49d32cda88fb4f53f4':
  CEC: Implement dump() of HdmiControlService
 2014-08-29 19:14:23 +00:00
Adam Powell
3367283946 am 7f729bf6: am 41d34328: am ae806d87: Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev 
* commit '7f729bf64fa345afbb16e762dfe916ecd94015ce':
  Doc improvements for new Toolbar changes, now with attributes.
 2014-08-29 19:14:18 +00:00
Adam Powell
8f8cfdb921 am df186cea: am 1ae3bf17: am cbed634a: Merge "Don\'t add title margins during to Toolbar layout if titles don\'t fit" into lmp-dev 
* commit 'df186cea1a71928839efe2b56b01ecdfdbfdbd4f':
  Don't add title margins during to Toolbar layout if titles don't fit
 2014-08-29 19:14:12 +00:00
Adam Powell
0372031382 am 7faa69ce: am 32e9145c: am 31192ba8: Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev 
* commit '7faa69ced32f3f3ce0f8ec3143f6d90d24b0dfc3':
  Add xml attributes to Toolbar for navigation icon
 2014-08-29 19:14:06 +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
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
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
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
38e02cfc35 am 176c0ecd: am 23f6a4ab: am 8178edfc: Merge "Fixing android.text.format.Time for non-English locales" 
* commit '176c0ecdb15683cdfb39c0fc9944213a65746b91':
  Fixing android.text.format.Time for non-English locales
 2014-08-29 12:02:04 +00: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
2cef380e47 am 133715ef: am 2458c71c: am 8308a3cb: Merge "Fix app widget serices not being unbound." into lmp-dev 
* commit '133715effa3ed2011e30c1956ea50bce88a961fb':
  Fix app widget serices not being unbound.
 2014-08-29 04:20:22 +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
01dfc9c69f am 07a0a79b: am f16343b7: am 2d53188b: Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 
* commit '07a0a79b85e3b7d7d9f755a4b45e0b01bc3e1076':
  Fix NPE when transitioning on unattached scene root.
 2014-08-29 03:36:21 +00:00
George Mount
e8ba00771f am e770e3a1: am 202532da: am 48514832: Merge "Fix NPE when clicking "back" quickly." into lmp-dev 
* commit 'e770e3a196a252e14079b9708ddfad2db19f4d19':
  Fix NPE when clicking "back" quickly.
 2014-08-29 03:36:16 +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
Adam Powell
f825e0c561 Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev 2014-08-29 02:49:47 +00:00