John Reck
ecb8785efc
am 1099d64b: am 09a0c7c8: Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev
...
* commit '1099d64b40f555da92a7aee56c55a20a6f5c24f8':
Free prefetched layers on TRIM_MEMORY
2014-08-29 18:52:48 +00:00
Svetoslav
5acf03c481
am 9f6c3630: am 37f72488: Merge "Fix the global gesture to enable accessibility." into lmp-dev
...
* commit '9f6c36305e2dcb385b157fb3e85cac80193cabdb':
Fix the global gesture to enable accessibility.
2014-08-29 18:52:42 +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
Selim Cinek
d87f226129
am c0121664: am 702d4abb: Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev
...
* commit 'c01216640b76f6511d2b3320f83eef14e74ecbfc':
Increasing the delay for the volume warning dialog with talkback
2014-08-29 18:52:32 +00:00
Jorim Jaggi
2e09793c2e
am ddd6040d: am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev
...
* commit 'ddd6040dadfe56f5bc9809e436f4a75538296a38':
Revert "Content description for padlock icon depending on state"
2014-08-29 18:52:27 +00:00
Jorim Jaggi
0c91868065
am d2f9ac27: am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev
...
* commit 'd2f9ac2729876aa7eab211e9698d1035d2b2c623':
Only dismiss Keyguard with space when screen is on
2014-08-29 18:52:07 +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
John Reck
eb50b8578d
am 09a0c7c8: Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev
...
* commit '09a0c7c8d511b8600d2a062d96c0e816a2aee761':
Free prefetched layers on TRIM_MEMORY
2014-08-29 17:15:58 +00:00
Svetoslav
5e843ee6ac
am 37f72488: Merge "Fix the global gesture to enable accessibility." into lmp-dev
...
* commit '37f72488ecb7a978ccaa77f0b74956a399a755fc':
Fix the global gesture to enable accessibility.
2014-08-29 17:15:49 +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
Selim Cinek
64bdd35340
am 702d4abb: Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev
...
* commit '702d4abba6e2b00c34529ddc757018b6b8e17fe1':
Increasing the delay for the volume warning dialog with talkback
2014-08-29 17:15:39 +00:00
Jorim Jaggi
9acdc4a37c
am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev
...
* commit '4c1f1f87943c3694df9fb541939c1a08decf070b':
Revert "Content description for padlock icon depending on state"
2014-08-29 17:15:34 +00:00
John Reck
4450c18e15
Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev
2014-08-29 17:09:50 +00:00
Svetoslav
074d27dd5d
Merge "Fix the global gesture to enable accessibility." into lmp-dev
2014-08-29 17:09:49 +00:00
John Reck
dff9957cc2
Free prefetched layers on TRIM_MEMORY
...
Bug: 17208461
Change-Id: I831c10d29d5920274b90e11a67d6cd106972a058
2014-08-29 09:59:43 -07:00
Lorenzo Colitti
e37679b27d
Merge "Really remove NetworkBoundURLFactory." into lmp-dev
2014-08-29 16:54:20 +00:00
Jorim Jaggi
c6d25c9b89
am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev
...
* commit '5224a3f29ac75dc0c9493bc45fa593dde8872b8d':
Only dismiss Keyguard with space when screen is on
2014-08-29 16:47:53 +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
Selim Cinek
e73a0a0195
Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev
2014-08-29 16:44:23 +00:00
Jorim Jaggi
497e699553
Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev
2014-08-29 16:42:59 +00:00
Jorim Jaggi
b5428e16cd
Revert "Content description for padlock icon depending on state"
...
This reverts commit 1518196a94ed006b2b45e5dc527a23721ec1147a.
It turned out that just "Unlock" is a better label there, as
announcing the state might be confusing.
Bug: 17255298
Change-Id: I13f3b3db68f3f96afcd4db33baf07e7e213aa12c
2014-08-29 18:42:32 +02:00
Jorim Jaggi
2cf8b71e14
Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev
2014-08-29 16:42:01 +00:00
Jorim Jaggi
2c33d5dcae
Only dismiss Keyguard with space when screen is on
...
Bug: 17206291
Change-Id: I7fd9c77a0810bb71c0e4193ab121398e8e78d43b
2014-08-29 18:41:03 +02: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
Selim Cinek
9f6ceb1d1c
Increasing the delay for the volume warning dialog with talkback
...
Bug: 17145793
Change-Id: I27eb9c46c8d73d5e475f97b50b0a2f219c4ed6fb
2014-08-29 16:28:39 +02: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
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