OSDN Git Service
Jae Seo [Fri, 12 Feb 2016 20:50:43 +0000 (20:50 +0000)]
Merge "TIF: Check the CEC message length before copying the data" into nyc-dev
Ben Wagner [Fri, 12 Feb 2016 20:32:02 +0000 (20:32 +0000)]
Merge "Deduplicate font file mappings." into nyc-dev
Julia Reynolds [Fri, 12 Feb 2016 20:31:54 +0000 (20:31 +0000)]
Merge "Show topic settings inline if user has configured topics." into nyc-dev
Amith Yamasani [Fri, 12 Feb 2016 20:27:54 +0000 (20:27 +0000)]
Merge "When the device boots up, netd works more than required" into nyc-dev
Ben Wagner [Thu, 28 Jan 2016 21:05:33 +0000 (16:05 -0500)]
Deduplicate font file mappings.
With ttc and gx variation fonts, it is now possible and common that a
number of fonts will use the same font file for data but with different
parameters. In the current code each font will map the font file data,
taking up an unecessary amount of virtual address space and is
inefficient with respect to memory management (like the tlb). This CL
deduplicates these file mappings so that a given font file will only be
mapped into memory once.
DO NOT MERGE
Change-Id: I5ca69f963a434c72ec4028402ecbf9e0f0ee7148
(cherry picked from commit
fffcf0a31fd4c9a4ec8aa7de70b1eda0d48fb337)
Jorim Jaggi [Thu, 11 Feb 2016 06:16:06 +0000 (22:16 -0800)]
Fix layout for full-screen floating windows
When the app doesn't set IN_SCREEN and INSET_DECOR but the window is
still full-screen, we force SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN but then
we still need to communicate the content insets to the DecorView.
In DecorView, we consume these insets in this mode and set it as
layout params so this behavior is completely transparent for the
app.
Bug:
26464646
Change-Id: Ib7332b845767a5bbc0266c380bf6240e322db943
Julia Reynolds [Fri, 12 Feb 2016 19:00:42 +0000 (19:00 +0000)]
Merge "Possibly fix deadlock." into nyc-dev
Julia Reynolds [Thu, 11 Feb 2016 13:54:24 +0000 (08:54 -0500)]
Possibly fix deadlock.
Bug:
27122790
Change-Id: I4361cc09e34ea71d7d69a54330ce52574c2b9b3d
Selim Cinek [Fri, 12 Feb 2016 18:56:45 +0000 (18:56 +0000)]
Merge changes If981a380,I48a8f882,I4b248b2f,Id9e6ce2a,Ib5239325, ... into nyc-dev
* changes:
Fixed a bug where custom notifications were invisible
Fixed a transformation error when fading in views
Fixed animation jank in notification groups
Fixed a bug where the single line view would be invisible
Fixed a bug where huns could be invisible
Fixed a crash with notification children
Adrian Roos [Fri, 5 Feb 2016 22:19:01 +0000 (14:19 -0800)]
Add setting for allowing remote input from keyguard
Bug:
26440855
Change-Id: I539b1c7ee6a874283df1104fe0743ef0495f9510
Ben Wagner [Fri, 12 Feb 2016 18:50:11 +0000 (18:50 +0000)]
Merge "Add support for gx font variation axes." into nyc-dev
Soi, Yoshinari [Tue, 22 Dec 2015 03:02:18 +0000 (12:02 +0900)]
When the device boots up, netd works more than required
When the device boots up, netd adds rules for applications
which do not have the NETWORK permission to iptables.
Therefore, optimize NetworkPolicyManagerService to not touch
uids that do not have the NETWORK permission.
This modification is similar to Google commit
88e98dfa5.
Cherry picked from AOSP commit to master.
Bug:
27165396
Change-Id: Ic8bb837143b9e349859210654248195d62b73d17
Vladislav Kaznacheev [Fri, 12 Feb 2016 18:22:20 +0000 (18:22 +0000)]
Merge "Make drag and drop comply with cross profile copy paste policy" into nyc-dev
Vladislav Kaznacheev [Fri, 12 Feb 2016 02:58:41 +0000 (18:58 -0800)]
Make drag and drop comply with cross profile copy paste policy
If UserManager.DISALLOW_CROSS_PROFILE_COPY_PASTE is false
then drag and drop is only possible between apps from the same
profile.
This CL also supports cross-profile content URI grants.
Bug:
26772503
Change-Id: I2e160cfdc6259fee2ea5e561c6e21fc0547dca2e
Rubin Xu [Fri, 12 Feb 2016 17:22:48 +0000 (17:22 +0000)]
Small refactoring to eliminate the need to allocate array.
Change-Id: Ib08a16e40c342b12e4f7106376f46d6279f29f2b
Matt Sarett [Fri, 12 Feb 2016 17:08:32 +0000 (17:08 +0000)]
Merge "Use SkCodec::MinBufferedBytes() for front buffered image decode stream" into nyc-dev
Jean-Michel Trivi [Fri, 12 Feb 2016 16:57:49 +0000 (16:57 +0000)]
Merge "Dynamic audio policies: JNI support for UID rules" into nyc-dev
Julia Reynolds [Fri, 12 Feb 2016 16:12:54 +0000 (11:12 -0500)]
Show topic settings inline if user has configured topics.
Change-Id: Icf51faad61b3ae4261991691a1d679b190ea712a
Ritesh Reddy [Fri, 12 Feb 2016 16:30:47 +0000 (16:30 +0000)]
Merge "Stashing SyncSettings for accounts added aft SUW" into nyc-dev
Ben Wagner [Fri, 6 Nov 2015 16:57:09 +0000 (11:57 -0500)]
Add support for gx font variation axes.
This adds an 'axis' child element to the 'font' element. The 'axis'
element has attributes 'tag' (a four byte identifier) and 'stylevalue'
(a float value) to the parser. This also modifies reading the font file
name in a backwards compatible fashion by using only the direct #text
children of the 'font' element. (Both the Minikin and Skia parsers now
allow the font file name on a separate line in the fonts.xml file).
This information is then passed through to Skia in order to select the
desired variation. The Skia parser already parses this way and has for
some time, so Chrome and WebView can already read this format.
Change-Id: I15623fe864fa92b2bf0705af5e389daedfb77e5c
(cherry picked from commit
b8e367fb7428076ff2e4aa2a97adaed1ef806e92)
Paul Stewart [Fri, 12 Feb 2016 16:27:07 +0000 (16:27 +0000)]
Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev
am:
323561773f
* commit '
323561773f43f561997155aed4654a6be3299511':
Revert "Properly map EAP-GTC for TTLS"
Paul Stewart [Fri, 12 Feb 2016 16:23:43 +0000 (16:23 +0000)]
Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev
Paul Stewart [Fri, 12 Feb 2016 16:21:01 +0000 (16:21 +0000)]
Revert "Properly map EAP-GTC for TTLS"
This reverts commit
be5084b87aa6a5e97becac6a43b448fee34196c2.
Reverting to re-land after test team does their thing
Change-Id: Ia236b77f08d15f47efb5469478000ded3b0d7954
Paul Stewart [Fri, 12 Feb 2016 16:12:37 +0000 (16:12 +0000)]
Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev
am:
724ea69e4b
* commit '
724ea69e4b4d79d59629e8152f2b0183e13aa45e':
Properly map EAP-GTC for TTLS
John Reck [Fri, 12 Feb 2016 16:11:30 +0000 (16:11 +0000)]
Merge "Fix bytesPerPixel for SurfaceTexture" into nyc-dev
John Reck [Fri, 12 Feb 2016 16:08:29 +0000 (08:08 -0800)]
Fix bytesPerPixel for SurfaceTexture
Bug:
27158985
Change-Id: I148a86d76314681eb778292dd0eb64503375f328
Paul Stewart [Fri, 12 Feb 2016 16:07:18 +0000 (16:07 +0000)]
Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev
Ritesh Reddy [Wed, 23 Dec 2015 18:24:23 +0000 (18:24 +0000)]
Stashing SyncSettings for accounts added aft SUW
Stashing SyncSettings for accounts not added by SUW Restore time
and restoring these settings whenever the account is added.
Bug:
26181613
Change-Id: Ia83e3fd43385a05424a8991115aa21ac90f4cd49
Narayan Kamath [Fri, 12 Feb 2016 15:41:31 +0000 (15:41 +0000)]
Merge "Track libcore change
9fbdd1b27de1a3d1005468108." into nyc-dev
Matt Sarett [Thu, 11 Feb 2016 22:03:54 +0000 (17:03 -0500)]
Use SkCodec::MinBufferedBytes() for front buffered image decode stream
This should not change decode behavior, but it's worth noting that
the number of bytes buffered will decrease from 64 to 30.
Change-Id: I66b0e38a487c1786823b0125686b094dae5d13dc
Sergey Poromov [Fri, 12 Feb 2016 15:05:59 +0000 (15:05 +0000)]
Merge "Use long for preflight check size in BackupManagerService." into nyc-dev
Kenny Guy [Fri, 12 Feb 2016 15:01:34 +0000 (15:01 +0000)]
Merge "Support FBE for managed profiles." into nyc-dev
Rubin Xu [Fri, 12 Feb 2016 14:40:10 +0000 (14:40 +0000)]
Merge "Maintain mSetupCompletedUsers for profiles correctly" into nyc-dev
Kenny Guy [Tue, 9 Feb 2016 16:02:35 +0000 (16:02 +0000)]
Support FBE for managed profiles.
Allow launcher to see and attempt to launch non-crypto
aware application when profile is locked.
Hide unlock notification until parent user is unlocked.
Have unlock notitication use confirm credentials to unlock
the profile.
Updated notification strings as per suggestions in mocks
to make it clearer between users and profiles.
Bug:
27038260
Change-Id: If2d2c8148670d814544f4edd44193d15da32a289
Rubin Xu [Fri, 12 Feb 2016 13:47:04 +0000 (13:47 +0000)]
Maintain mSetupCompletedUsers for profiles correctly
When listening for USER_SETUP_COMPLETE changes, refresh the state for
the affected user instead of the current foreground user which excludes
the active managed profile.
Bug:
27061092
Change-Id: Iae525464d3d3faab9afb76aaf4304b9f10382e01
Clara Bayarri [Fri, 12 Feb 2016 13:54:09 +0000 (13:54 +0000)]
Merge "Add support for current failed lock attempts and max attempts" into nyc-dev
Clara Bayarri [Thu, 11 Feb 2016 17:48:53 +0000 (17:48 +0000)]
Add support for current failed lock attempts and max attempts
This is needed from Settings to show a message informing the user
of the number of attempts before their work profile gets wiped
when using ConfirmDeviceCredentials.
Bug:
26677759
Change-Id: I4b16f7dc2f415d0ce0215a3b7a646f98fabece33
Derek Sollenberger [Fri, 12 Feb 2016 13:40:42 +0000 (13:40 +0000)]
Merge "Update HWUI makefiles to support use by other targets (e.g. Skia)" into nyc-dev
Rubin Xu [Fri, 12 Feb 2016 11:53:44 +0000 (11:53 +0000)]
Merge "Fix testApplicationRestrictionsManagingApp unit test" into nyc-dev
Narayan Kamath [Fri, 12 Feb 2016 11:48:19 +0000 (11:48 +0000)]
Track libcore change
9fbdd1b27de1a3d1005468108.
bug:
26689841
Change-Id: I3a0e5d3ab1ada313d73514913990a2aa19ad5b8f
Daniel U [Fri, 12 Feb 2016 11:24:55 +0000 (11:24 +0000)]
Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev
Shweta Chahar [Fri, 12 Feb 2016 11:18:33 +0000 (11:18 +0000)]
Merge "Remove higher speech rate settings." into nyc-dev
Erik Kline [Fri, 12 Feb 2016 11:01:48 +0000 (20:01 +0900)]
resolve merge conflicts of
3b74289fdf to nyc-dev
Change-Id: Ib41c75bf44bdafbe57532717e8f41a4ed545d29c
Erik Kline [Fri, 12 Feb 2016 10:51:53 +0000 (10:51 +0000)]
Merge "Duplicate DhcpStateMachine public constants into DhcpClient" into nyc-dev
Gustav Sennton [Fri, 12 Feb 2016 10:35:23 +0000 (10:35 +0000)]
Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev
Erik Kline [Thu, 11 Feb 2016 15:17:02 +0000 (00:17 +0900)]
Duplicate DhcpStateMachine public constants into DhcpClient
This is so we can ultimately delete DhcpStateMachine altogether.
Bug:
24837343
Bug:
26991160
Change-Id: If116639e5f72c97cfc67f748dc5f6433dccd9cf0
Jae Seo [Fri, 12 Feb 2016 08:12:36 +0000 (00:12 -0800)]
TIF: Check the CEC message length before copying the data
Bug:
25768736
Change-Id: Ife46891e785fe816c0ee6ba65bd57512366ce84d
Erik Kline [Thu, 11 Feb 2016 15:17:02 +0000 (00:17 +0900)]
Duplicate DhcpStateMachine public constants into DhcpClient
This is so we can ultimately delete DhcpStateMachine altogether.
Bug:
24837343
Bug:
26991160
Change-Id: If116639e5f72c97cfc67f748dc5f6433dccd9cf0
Phil Burk [Fri, 12 Feb 2016 06:32:13 +0000 (06:32 +0000)]
Merge "AudioTrack: fix docs for return code for setBufferSizeInFrames()" into nyc-dev
Roozbeh Pournader [Fri, 12 Feb 2016 05:19:36 +0000 (05:19 +0000)]
Merge "Fix locale matching algorithm for resources" into nyc-dev
Roozbeh Pournader [Fri, 12 Feb 2016 01:58:24 +0000 (17:58 -0800)]
Fix locale matching algorithm for resources
We get ResTables two different ways: one is from AAPT, another from
settings-based requests from the Java side. In the settings-based
requests, localeScript will be autocomputed, but for AAPT-filled
tables (especially if they come from older versions of AAPT), we need
to compute the script.
Previously, locales that came from packages were incorrectly assumed
to have "undeterminable" scripts, rather than "undetermined" scripts.
This led to us mistakenly falling back to the old logic of requiring
the locales' countries to match, rather than just looking at computed
scripts.
Bug:
27157452
Change-Id: Id7e346d3ecfb17273ffb63de5bcb4849a6eafbbd
Tomasz Mikolajewski [Tue, 9 Feb 2016 10:48:49 +0000 (19:48 +0900)]
Do not show directory change animation on screen rotation.
When more than one level deep directory is opened.
Bug:
27090439
Change-Id: I73e789a820af3b710f0981ac12f5ea43cc389cf6
(cherry picked from commit
f908640fd07b4734b8ef235ed2849ea20c55acab)
Tyler Gunn [Fri, 12 Feb 2016 03:45:32 +0000 (03:45 +0000)]
Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev
am:
989594638a
* commit '
989594638ad2aa7360cf39b5ea67c137a9078c86':
IMS RAT Reporting in Registration Unsol
Tyler Gunn [Fri, 12 Feb 2016 03:40:08 +0000 (03:40 +0000)]
Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev
Jorim Jaggi [Fri, 12 Feb 2016 03:18:47 +0000 (19:18 -0800)]
Fix NullPointerException
Change-Id: Ifce7af5ac6aacc04fb621f3afd707164f36ba980
Jorim Jaggi [Fri, 12 Feb 2016 03:12:17 +0000 (03:12 +0000)]
Merge "Handle light status bar for split-screen" into nyc-dev
Daichi Hirono [Fri, 12 Feb 2016 02:51:16 +0000 (02:51 +0000)]
Merge "Add error message for locked device." into nyc-dev
Daichi Hirono [Thu, 11 Feb 2016 00:55:37 +0000 (16:55 -0800)]
Add error message for locked device.
If the remote MTP device is a smartphone, it does not provide files
until a user unlocks the device. The CL adds specific error message for
the situation.
BUG=
26318917
Change-Id: Ic4c34609c55ec9c99b7b8a9143d6dae3835784e3
Daichi Hirono [Fri, 12 Feb 2016 02:38:29 +0000 (02:38 +0000)]
Merge "Open the connected device in Files app when tapping notification." into nyc-dev
Selim Cinek [Fri, 12 Feb 2016 02:18:08 +0000 (18:18 -0800)]
Fixed a bug where custom notifications were invisible
Change-Id: If981a380ed7e3ef7000e245aefaf36d039e15cfa
Jim Miller [Mon, 8 Feb 2016 21:58:21 +0000 (13:58 -0800)]
Update FBE notification strings
Fixes bug
26863154
Change-Id: I6b130a8ba6e21e2cbd47551aabf5fc3e31f6f1c0
(cherry picked from commit
6338561c925fc4885275949d29193c14e83db71f)
Selim Cinek [Fri, 12 Feb 2016 02:07:43 +0000 (18:07 -0800)]
Fixed a transformation error when fading in views
Views could still be stuck in a old translation and
therefore the whole view looked weird.
Change-Id: I48a8f8824d8e5bdb0913a24783967a36c34797a8
Selim Cinek [Fri, 12 Feb 2016 01:21:16 +0000 (17:21 -0800)]
Fixed animation jank in notification groups
When group children are animating from single line to expanded,
the animation was jarring.
Change-Id: I4b248b2f59a842befaa0f5d5440c55f140584da2
Adam Lesinski [Fri, 12 Feb 2016 01:42:16 +0000 (01:42 +0000)]
Merge "AAPT: Remove warnings for public resources without comments" into nyc-dev
Fyodor Kupolov [Fri, 12 Feb 2016 01:37:37 +0000 (01:37 +0000)]
Merge "Clear calling identity before setting restrictions" into nyc-dev
Daichi Hirono [Fri, 12 Feb 2016 01:02:52 +0000 (01:02 +0000)]
Merge "Show specific error message for busy device." into nyc-dev
Daichi Hirono [Fri, 12 Feb 2016 00:51:28 +0000 (00:51 +0000)]
Merge "Returns "application/octet-stream" for unknown types of MTP files." into nyc-dev
Felipe Leme [Fri, 12 Feb 2016 00:50:46 +0000 (00:50 +0000)]
Merge "Optimized add|removeRestrictBackgroundWhitelistedUid()." into nyc-dev
Selim Cinek [Fri, 12 Feb 2016 00:43:41 +0000 (16:43 -0800)]
Fixed a bug where the single line view would be invisible
When updating a child notification, the single line view was
removed leading to invisible group children.
Bug:
27137268
Change-Id: Id9e6ce2ae081ec746118f4367644ea8843d51f10
Phil Burk [Fri, 12 Feb 2016 00:42:13 +0000 (16:42 -0800)]
AudioTrack: fix docs for return code for setBufferSizeInFrames()
Also added some documentation links that were failing before.
Change-Id: I0a744dd0a3d3e1d09f643b35d976863fa0422d10
Signed-off-by: Phil Burk <philburk@google.com>
Felipe Leme [Fri, 12 Feb 2016 00:40:40 +0000 (00:40 +0000)]
Merge "Split bugreport identifier into id and pid." into nyc-dev
Daichi Hirono [Thu, 11 Feb 2016 18:08:21 +0000 (10:08 -0800)]
Open the connected device in Files app when tapping notification.
Previously when tapping the MTP devce notification, MtpDocumentsProvider
opens home direcotry in Files app. The CL adds data URI of connected
device to the intent so that MtpDocumentsProvider can open the connected
device's root in Files app.
BUG=
26611224
Change-Id: I97ecd6669852cd2fc875294cbcbf5660fbfaa0da
Etan Cohen [Fri, 12 Feb 2016 00:35:10 +0000 (00:35 +0000)]
NAN: Disable all DBG flags.
am:
7d6c389edf
* commit '
7d6c389edf41ef8ce490fa7af963484f9502cbc1':
NAN: Disable all DBG flags.
Winson Chung [Fri, 12 Feb 2016 00:29:42 +0000 (00:29 +0000)]
Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev
* changes:
Adding view debug annotations to simplifying debugging state.
Disallow launching third party apps in safe mode.
Drawing thumbnail background color for empty space in view.
Tomasz Mikolajewski [Fri, 12 Feb 2016 00:26:44 +0000 (00:26 +0000)]
Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev
Jae Seo [Fri, 12 Feb 2016 00:05:00 +0000 (00:05 +0000)]
Merge "TIF: Separate service connection errors from recording errors" into nyc-dev
Fyodor Kupolov [Fri, 12 Feb 2016 00:04:03 +0000 (00:04 +0000)]
Merge "During update enable system apps for requested users only" into nyc-dev
Omkar Kolangade [Tue, 5 May 2015 00:49:14 +0000 (17:49 -0700)]
IMS RAT Reporting in Registration Unsol
Adding a parameter to the IMS registration complete
and progressing callbacks, allowing frameworks to be
notified of the radio access technology over which
IMS is registered.
Bug:
21902225
Change-Id: I271f2fca299585302a67d0f5476f6fac3e7099dd
Jae Seo [Thu, 11 Feb 2016 08:59:10 +0000 (00:59 -0800)]
TIF: Separate service connection errors from recording errors
Also clarify the expected behaviors when an error has occurred in a
recording session.
Bug:
27110861
Change-Id: I811197e45ea94b1b0e151d534a1f030a84b89d10
Selim Cinek [Thu, 11 Feb 2016 23:43:03 +0000 (15:43 -0800)]
Fixed a bug where huns could be invisible
When an unpinned fullscreen notification was in the shade
all successive normal huns would be invisible.
Also removed the sorted entries as it could lead to stale
data and crashes.
Bug:
27136766
Change-Id: Ib5239325e452a2b949cb4a4b8478d231189c4722
Rob Carr [Thu, 11 Feb 2016 23:06:25 +0000 (23:06 +0000)]
Merge "Correct error in window lifetime." into nyc-dev
Etan Cohen [Thu, 11 Feb 2016 22:57:00 +0000 (14:57 -0800)]
NAN: Disable all DBG flags.
Change-Id: Ib60cf3c9fd4c8dbf973e118d94340fbfd890a738
Shreyas Basarge [Thu, 11 Feb 2016 17:06:13 +0000 (17:06 +0000)]
Fix for JobScheduler dropping periodic jobs
Skip writing to disk when a periodic job is
removed from jobStore after it completes
execution.
Change-Id: Ib4f2cf18554bf9c87138c1984c96cc62f8dbf7e2
Bug:
27147454
Paul Stewart [Sat, 16 Jan 2016 02:56:52 +0000 (18:56 -0800)]
Properly map EAP-GTC for TTLS
The "auth=GTC" method was never valid for the TTLS outer
authentication for wpa_supplicant. Instead, to perform
GTC authentication within TTLS, we should use EAP-GTC.
This CL performs this mapping within WifiEnterpriseConfig.
It accomplishes this by making the EAP Method and Phase 2
Method parameters a part of the internal object state
instead of maintaining this value within the mFields
hashmap.
Further, the problematic "getFields" method is removed
since as this actually provided read/write access to the
entirety of the WifiEnterpriseConfig's internal state.
This was understandably suboptimal. All callers have
been updated to either use getFieldValue() or to call
a newly added getSupplicantFields() / setSupplicantFields()
methods which make the WifiEnterpriseConfig object a sole
arbiter for the mapping between its internal state and
wpa_supplicant.
In the future it might be good to change this logic to
strip WifiEnterpriseConfig of all of the string hashmap
entirely, leaving WifiEnterpriseConfig as a "struct"
and move supplicant mappings to WifiConfigStore.
Bug:
26400915
Test:runtest frameworks-wifi # New unit test in the same topic
Test:cts-tradefed run cts -d --class android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I1e09fb3f1f27b2ba844acbed14ec0f570e915b80
Selim Cinek [Thu, 11 Feb 2016 22:47:06 +0000 (14:47 -0800)]
Fixed a crash with notification children
When moving children between parents, Sysui could crash
because it wasn't removed yet properly from the old parent.
We are now doing this sequencially, i.e first removing the
children and then adding the new ones.
Bug:
27137301
Change-Id: I1925662a9d7f224f133827d524d080994753ba25
John Reck [Thu, 11 Feb 2016 22:35:35 +0000 (22:35 +0000)]
Merge "Fix build" into nyc-dev
John Reck [Thu, 11 Feb 2016 22:35:08 +0000 (14:35 -0800)]
Fix build
Change-Id: Id793d3a824902ab794b5d5a4cdf4c77a72c52add
Ben Kwa [Thu, 11 Feb 2016 22:18:53 +0000 (22:18 +0000)]
Merge "Handle spacebar events." into nyc-dev
Adam Lesinski [Thu, 11 Feb 2016 22:17:25 +0000 (14:17 -0800)]
AAPT: Remove warnings for public resources without comments
There are so many public resources that do not warrant comments
that having a warning that no one cares about is just producing
log spam.
Bug:
21495023
Change-Id: I84e3b39c7139ee67fb5cb711d5ab466d8f4ef2e0
John Reck [Thu, 11 Feb 2016 22:05:14 +0000 (22:05 +0000)]
Merge "Fix bpp mismatch" into nyc-dev
Ben Kwa [Thu, 11 Feb 2016 21:29:12 +0000 (13:29 -0800)]
Handle spacebar events.
Space/Shift-space scrolls the files list up/down.
BUG=
25195555
This is a re-land of ag/864217.
Change-Id: I496d43d8a0c0833493ec2d5b36ecb7cbeb619853
Derek Sollenberger [Thu, 11 Feb 2016 17:13:07 +0000 (12:13 -0500)]
Update HWUI makefiles to support use by other targets (e.g. Skia)
(1) Update both static and shared lib to export libhwui headers
(2) Work around problem in current make system where a static
libraries dependencies are not transitively included by moving
those dependencies into a file that can be included by targets
using libhwui_static.
(3) Do not expose protobuf headers to clients outside of HWUI
Change-Id: I08470c02a83ae64116081eff0c2050878990c6ed
John Reck [Thu, 11 Feb 2016 21:22:25 +0000 (13:22 -0800)]
Fix bpp mismatch
Bug:
26980851
GL_RGBA16F was being incorrectly calculated
as 4 bpp instead of 16 in Texture's objectSize(),
leading to a mismatch in cache size tracking
in GradientCache
Change-Id: I533c52fcdf9910d7a7d14bbd80965b8cbef8e147
Ben Kwa [Thu, 11 Feb 2016 21:20:07 +0000 (21:20 +0000)]
Merge "Revert "Handle spacebar events."" into nyc-dev
Ben Kwa [Thu, 11 Feb 2016 21:19:54 +0000 (21:19 +0000)]
Revert "Handle spacebar events."
This reverts commit
ef8eb5c9dd45cc94219d6e889d026f53ecc5c7e9.
Change-Id: I6c473d09eae8289da1deb86a8f043aa88de4c6f0
Ben Kwa [Wed, 10 Feb 2016 19:54:55 +0000 (11:54 -0800)]
Make left- and right- arrow jump rows in grid mode.
Like ChromeOS. Pressing left at the beginning of a row of files in grid
mode, will move focus up to the end of the preceding row. Analogous
behaviour for right-arrow at the end of a row.
BUG=
27127282
Change-Id: I3b36c1da6559aaf01558807913502f8ab87a9e6e
(cherry picked from commit
f55e5b714d4adc9f343ab7e691a6846ffa6cd7b1)
Ben Kwa [Thu, 11 Feb 2016 21:08:52 +0000 (21:08 +0000)]
Merge "Allow multiple range selections using the shift key." into nyc-dev
Ben Kwa [Thu, 11 Feb 2016 21:07:11 +0000 (21:07 +0000)]
Merge "Handle shift-enter key events." into nyc-dev
Ben Kwa [Thu, 11 Feb 2016 21:06:51 +0000 (21:06 +0000)]
Merge "Handle spacebar events." into nyc-dev
Lifu Tang [Thu, 11 Feb 2016 21:06:00 +0000 (21:06 +0000)]
Merge "Fixed the build break" into nyc-dev