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

154153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
c51cc683bc am 056468ef: am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '056468ef3b9b63d251c4aac867ae634f813d18cf':
  Fix memory leak in ResTable
 2014-08-29 19:14:28 +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
Adam Lesinski
1be18d56a1 am 9e186ec3: am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit '9e186ec3a0e87e612786b827c04b6c6e1b507196':
  Stamp platform version code into app Apks
 2014-08-29 19:14:01 +00:00
Jeff Tinker
44e21a21b0 am 576dc318: am d83b4f16: am b8ccb705: Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 
* commit '576dc3188364d54137151913230b01ab18af2324':
  Fix exception message string formatting in MediaDrm
 2014-08-29 19:13:55 +00:00
Svetoslav
8a01aa95f4 am 58691e29: am 221ae208: am 6a353ad0: Merge "Print UI polish." into lmp-dev 
* commit '58691e2945f554849d606a6ed052c181e227e4ac':
  Print UI polish.
 2014-08-29 19:13:50 +00:00
Adam Lesinski
ec187b726b am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '1ec1f85d6ebab39f3aad6f426e0fe0aeca2b04bb':
  Fix memory leak in ResTable
 2014-08-29 18:49:14 +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
Adam Lesinski
343cabb316 am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit '60f193fbe905f65750503cdaf8616d31c85016d6':
  Stamp platform version code into app Apks
 2014-08-29 18:48:33 +00:00
Jeff Tinker
2419629be7 am d83b4f16: am b8ccb705: Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 
* commit 'd83b4f1660de78738a881623d0bb3e45966fc32d':
  Fix exception message string formatting in MediaDrm
 2014-08-29 18:48:28 +00:00
Svetoslav
9b7c16ef48 am 221ae208: am 6a353ad0: Merge "Print UI polish." into lmp-dev 
* commit '221ae208fb262d4cd177e292babef3856be52e5d':
  Print UI polish.
 2014-08-29 18:48:23 +00: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
Brian Carlstrom
86bf3d7e60 am 0365f28d: am d1dc0394: am 6d3c8255: Merge "Remove obsolete pruneDexCache" 
* commit '0365f28d5b0420b2706294312a8b4d34c35eac78':
  Remove obsolete pruneDexCache
 2014-08-29 12:01:59 +00:00
Brian Carlstrom
ed5f9d1a25 am db033e3e: am c22e56dd: am 7d86375b: Merge "Change /dalvik-cache to be owned by root." 
* commit 'db033e3ea974538f22ba1f44b7ab09910f2044c5':
  Change /dalvik-cache to be owned by root.
 2014-08-29 12:01:55 +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
Brian Carlstrom
701663e381 am d1dc0394: am 6d3c8255: Merge "Remove obsolete pruneDexCache" 
* commit 'd1dc039438b33d58ad9973ed6fe6f2a5f593819d':
  Remove obsolete pruneDexCache
 2014-08-29 11:39:45 +00:00
Brian Carlstrom
bc9eb5d1b3 am c22e56dd: am 7d86375b: Merge "Change /dalvik-cache to be owned by root." 
* commit 'c22e56dd1209accaff898c02677ff7091fe4b973':
  Change /dalvik-cache to be owned by root.
 2014-08-29 11:39:21 +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
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
Adam Lesinski
88fff68115 am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '995c771f7aef835972a5044f267a2d201449efab':
  Fix memory leak in ResTable
 2014-08-29 05:40:25 +00:00
Adam Lesinski
a9aa9f0458 Merge "Fix memory leak in ResTable" into lmp-dev 2014-08-29 05:27:49 +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
Terry Heo
97bf45464c Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev 2014-08-29 05:12:57 +00:00
Dongwon Kang
52605792e2 am 02a24fa1: am 9d5dadc9: am 2e585e88: Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev 
* commit '02a24fa16e819d3cf75d7b4b93ee09354a7a253e':
  TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
 2014-08-29 04:20:33 +00:00
Dianne Hackborn
a552f23f44 am c19eea49: am 3452f1cf: am 1fee525a: Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 
* commit 'c19eea492289cbd9ec0ffecfb5837e44cd14cf14':
  Debug issue #17310019: pause when launching settings
 2014-08-29 04:20:28 +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
Alex Light
06e8595952 am fbe7c94f: am edcab233: am a2f18dc1: Remove obsolete pruneDexCache 
* commit 'fbe7c94f4162034e857556284858bb33c5ceb5fe':
  Remove obsolete pruneDexCache
 2014-08-29 04:20:16 +00:00
Alex Light
9daa2aa9d1 am d0674838: am 63a1740d: am 19f3d22f: Change /dalvik-cache to be owned by root. 
* commit 'd0674838f9c7d950d34c0e01727c7c22dfc3992e':
  Change /dalvik-cache to be owned by root.
 2014-08-29 04:20:11 +00:00
Dongwon Kang
a859169324 am 444da437: am 8f50a388: am 6b9575be: Merge "TIF: cosmetic changes for consistency." into lmp-dev 
* commit '444da43744719467c6deb385ba13fbff5fa606d0':
  TIF: cosmetic changes for consistency.
 2014-08-29 04:20:05 +00:00
RoboErik
53eb8c9c15 am 501244ea: am 563efe4c: am 85f23210: Fix test build 
* commit '501244eaec4207efd413bac4b0bb86ec15f97bf5':
  Fix test build
 2014-08-29 04:20:00 +00:00
Jeff Sharkey
a63cda7b24 am dd928c7e: am f9dfbbf3: am f894a0d3: Merge "Teach API lint about package layering!" into lmp-dev 
* commit 'dd928c7e214ff7fd865e4b71bf273ae57691922c':
  Teach API lint about package layering!
 2014-08-29 04:19:54 +00:00
Dongwon Kang
1f36333ee2 am 9d5dadc9: am 2e585e88: Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev 
* commit '9d5dadc9317228156849dae14e0e75ca8d8950f9':
  TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
 2014-08-29 03:58:58 +00:00
Dianne Hackborn
84c043dace am 3452f1cf: am 1fee525a: Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 
* commit '3452f1cf2d3451fbb5f69c0e0102f808354852b2':
  Debug issue #17310019: pause when launching settings
 2014-08-29 03:58:52 +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
Alex Light
cd91f11be5 am edcab233: am a2f18dc1: Remove obsolete pruneDexCache 
* commit 'edcab2336315f90b225c85d2d6d725ec79679b26':
  Remove obsolete pruneDexCache
 2014-08-29 03:58:41 +00:00
Alex Light
65793be1bf am 63a1740d: am 19f3d22f: Change /dalvik-cache to be owned by root. 
* commit '63a1740d4f3b195f7de67e021f75c253a5c3ca7e':
  Change /dalvik-cache to be owned by root.
 2014-08-29 03:58:34 +00:00
Dongwon Kang
ada47f476f am 8f50a388: am 6b9575be: Merge "TIF: cosmetic changes for consistency." into lmp-dev 
* commit '8f50a3888a62303cbdc683654c686223b8266bf4':
  TIF: cosmetic changes for consistency.
 2014-08-29 03:58:29 +00:00
RoboErik
1b6dc49e37 am 563efe4c: am 85f23210: Fix test build 
* commit '563efe4c598b5b0fb92c23343c90e68b3f76c01c':
  Fix test build
 2014-08-29 03:58:23 +00:00
Jeff Sharkey
2db944fa30 am f9dfbbf3: am f894a0d3: Merge "Teach API lint about package layering!" into lmp-dev 
* commit 'f9dfbbf3c0e2f12a8c712704e43f3dff66beb151':
  Teach API lint about package layering!
 2014-08-29 03:58:15 +00:00
Adam Powell
31ffb26a31 am ae806d87: Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev 
* commit 'ae806d87bd321826f1dec904e7aff6d02d501689':
  Doc improvements for new Toolbar changes, now with attributes.
 2014-08-29 03:37:49 +00:00
Adam Powell
b1b5ee6029 am cbed634a: Merge "Don\'t add title margins during to Toolbar layout if titles don\'t fit" into lmp-dev 
* commit 'cbed634abd495e6f14b45c6fcfa3b63f2e68e6be':
  Don't add title margins during to Toolbar layout if titles don't fit
 2014-08-29 03:37:42 +00:00
Adam Powell
258f50064c am 31192ba8: Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev 
* commit '31192ba8a6bdce3e686ecaddfb8d393fea39d884':
  Add xml attributes to Toolbar for navigation icon
 2014-08-29 03:37:35 +00: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