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

154196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
c70110fabf am 3a28b9a8: am 243a2bcb: am 35d00b45: Update paddings for more card to match notification layouts 
* commit '3a28b9a8bceee4b48476f1d3518a694801267e4c':
  Update paddings for more card to match notification layouts
 2014-08-29 19:15:27 +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
Neil Fuller
bea2e6d9a2 am 0f2d32e3: am 468b3c5e: am 245eaa25: Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev 
* commit '0f2d32e393f217ed4c3a6e288268f619697dfe74':
  Fixing android.text.format.Time for non-English locales
 2014-08-29 19:15:17 +00:00
Kenny Guy
f7db26a598 am de28d664: am d74446b2: am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev 
* commit 'de28d664e33c27f432f8f0ba379ad213488fd10d':
  Load ApplicationInfo for correct user.
 2014-08-29 19:15:13 +00:00
Yohei Yukawa
af98b01210 am bc51bee9: am 7046f79e: am bbee6beb: Merge "Reject request when any unknown flag is speficied" into lmp-dev 
* commit 'bc51bee9dbcc50a6a5a507e511cdcdf6aa63d054':
  Reject request when any unknown flag is speficied
 2014-08-29 19:15:06 +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
Jungshik Jang
1e0a8127f4 am c14c0aa3: am 78045632: am 92be4d75: Merge "Fix system audio mode failure in boot up" into lmp-dev 
* commit 'c14c0aa3809f284ea861a63f67c8193a639789e0':
  Fix system audio mode failure in boot up
 2014-08-29 19:14:38 +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
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
Jorim Jaggi
3db48ac715 am 243a2bcb: am 35d00b45: Update paddings for more card to match notification layouts 
* commit '243a2bcb25c3dc3dfdf13fe81d1f840ae35b7b22':
  Update paddings for more card to match notification layouts
 2014-08-29 18:52:02 +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
Neil Fuller
95126ae207 am 468b3c5e: am 245eaa25: Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev 
* commit '468b3c5e8133e6d9d4e48b3d67cac982e24a9c5a':
  Fixing android.text.format.Time for non-English locales
 2014-08-29 18:50:42 +00:00
Kenny Guy
42fc95cedc am d74446b2: am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev 
* commit 'd74446b251aa2258ef6bbff33019a236836630be':
  Load ApplicationInfo for correct user.
 2014-08-29 18:50:30 +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
Jungshik Jang
23e972e311 am 78045632: am 92be4d75: Merge "Fix system audio mode failure in boot up" into lmp-dev 
* commit '78045632a35e4aaaa2b94157ef806319d515f59d':
  Fix system audio mode failure in boot up
 2014-08-29 18:49:45 +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
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
Jorim Jaggi
7a79b33039 am 35d00b45: Update paddings for more card to match notification layouts 
* commit '35d00b452b8417d920f855b914559695a3a73d79':
  Update paddings for more card to match notification layouts
 2014-08-29 16:47:48 +00:00
Jorim Jaggi
6b58ab5809 Update paddings for more card to match notification layouts 
Bug: 15437369
Change-Id: I6e9b1ce420d1d7217a455519a746ad28ed1fa75d
 2014-08-29 16:40:06 +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
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
Kenny Guy
4f9cbd2a2b am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev 
* commit '21e106f8c1578767a829bd8895b8d101af3b4f8d':
  Load ApplicationInfo for correct user.
 2014-08-29 11:10:09 +00:00
Kenny Guy
d5936307fb Merge "Load ApplicationInfo for correct user." into lmp-dev 2014-08-29 11:01:04 +00:00