John Reck
9bf6280b7a
Merge "Include containing window title in SurfaceView\'s title" into nyc-dev am: 182bd38430
...
am: b707ce7837
* commit 'b707ce7837d471a79c100348db0af75e21a42513':
Include containing window title in SurfaceView's title
2016-02-12 22:36:18 +00:00
John Reck
b707ce7837
Merge "Include containing window title in SurfaceView\'s title" into nyc-dev
...
am: 182bd38430
* commit '182bd384304c7b96b197298e5bc866858da01bf4':
Include containing window title in SurfaceView's title
2016-02-12 22:30:54 +00:00
John Reck
182bd38430
Merge "Include containing window title in SurfaceView's title" into nyc-dev
2016-02-12 22:24:01 +00:00
Dianne Hackborn
e66919a9e5
Merge "Fix crash during boot."
2016-02-12 21:55:34 +00:00
Amith Yamasani
e2361efcc5
Merge "Use hasInternetPermission method" into nyc-dev am: 6b6b9c6425
...
am: dff704d50f
* commit 'dff704d50f260630020d7e4c0adb0eed9b53cbc0':
Use hasInternetPermission method
2016-02-12 21:40:05 +00:00
Amith Yamasani
dff704d50f
Merge "Use hasInternetPermission method" into nyc-dev
...
am: 6b6b9c6425
* commit '6b6b9c6425074b1010804694dcba08073dc78946':
Use hasInternetPermission method
2016-02-12 21:35:11 +00:00
Zachary Kuznia
d34cfce673
Update the timeout values for accessibility gestures. am: c8e941f4ba
...
am: 051c1675b0
* commit '051c1675b04c7dc763f441aee998d3956240bfe4':
Update the timeout values for accessibility gestures.
2016-02-12 21:35:11 +00:00
Shreyas Basarge
4b2c4284cf
Merge "Add defaultPeriodic to every authority" into nyc-dev am: e4f490cc69
...
am: cece452ccb
* commit 'cece452ccbe8731a61ac02acb4e0947840f7fe40':
Add defaultPeriodic to every authority
2016-02-12 21:30:41 +00:00
Amith Yamasani
6b6b9c6425
Merge "Use hasInternetPermission method" into nyc-dev
2016-02-12 21:29:15 +00:00
Adam Powell
32c6426930
Merge "ChooserActivity direct share jank fixes" into nyc-dev am: 5e6d6f5824
...
am: 94cf50d1f5
* commit '94cf50d1f589ed94802ef51cd00c993813abf994':
ChooserActivity direct share jank fixes
2016-02-12 21:28:36 +00:00
Zachary Kuznia
051c1675b0
Update the timeout values for accessibility gestures.
...
am: c8e941f4ba
* commit 'c8e941f4ba5a7ce488deb7606606e2ff6c8f7cf8':
Update the timeout values for accessibility gestures.
2016-02-12 21:28:29 +00:00
Shreyas Basarge
cece452ccb
Merge "Add defaultPeriodic to every authority" into nyc-dev
...
am: e4f490cc69
* commit 'e4f490cc6910cbffdedd4977e68ae57a6437bb13':
Add defaultPeriodic to every authority
2016-02-12 21:23:53 +00:00
Adam Powell
94cf50d1f5
Merge "ChooserActivity direct share jank fixes" into nyc-dev
...
am: 5e6d6f5824
* commit '5e6d6f5824bf194e5466797c7ff741de5b8e49fb':
ChooserActivity direct share jank fixes
2016-02-12 21:22:18 +00:00
Zachary Kuznia
c8e941f4ba
Update the timeout values for accessibility gestures.
...
Change-Id: I1e6ed7bbec46b848c1278922be3110733a64dcb6
(cherry picked from commit 0522205fd5 )
2016-02-12 21:20:36 +00:00
Shreyas Basarge
e4f490cc69
Merge "Add defaultPeriodic to every authority" into nyc-dev
2016-02-12 21:16:32 +00:00
Adam Powell
5e6d6f5824
Merge "ChooserActivity direct share jank fixes" into nyc-dev
2016-02-12 21:14:39 +00:00
Aurimas Liutikas
eadaeee848
Merge "Start saving iconified state of SearchView." into nyc-dev am: 3043c7b19d
...
am: f878fdd68a
* commit 'f878fdd68add8e38104e00c90eef6630eb41f52f':
Start saving iconified state of SearchView.
2016-02-12 21:11:54 +00:00
Aurimas Liutikas
f878fdd68a
Merge "Start saving iconified state of SearchView." into nyc-dev
...
am: 3043c7b19d
* commit '3043c7b19d873fdeb578fe84b003162fc85f923e':
Start saving iconified state of SearchView.
2016-02-12 21:06:12 +00:00
Jae Seo
8554491e54
Merge "TIF: Check the CEC message length before copying the data" into nyc-dev am: b6748a2aec
...
am: 5273df7dd7
* commit '5273df7dd79ecc71814f0063e09659bdfdf07aa8':
TIF: Check the CEC message length before copying the data
2016-02-12 21:01:55 +00:00
Aurimas Liutikas
3043c7b19d
Merge "Start saving iconified state of SearchView." into nyc-dev
2016-02-12 20:58:05 +00:00
Jae Seo
5273df7dd7
Merge "TIF: Check the CEC message length before copying the data" into nyc-dev
...
am: b6748a2aec
* commit 'b6748a2aec3c4d7e41dccb69eaf29c76780ef4e8':
TIF: Check the CEC message length before copying the data
2016-02-12 20:56:46 +00:00
Jae Seo
b6748a2aec
Merge "TIF: Check the CEC message length before copying the data" into nyc-dev
2016-02-12 20:50:44 +00:00
Ben Wagner
1531a187a1
Merge "Deduplicate font file mappings." into nyc-dev am: 242afb7809
...
am: e87aa6181e
* commit 'e87aa6181eb28ce5aa8aa6a73b1cca6b8db2036d':
Deduplicate font file mappings.
2016-02-12 20:50:42 +00:00
Julia Reynolds
dd94f700ae
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
2016-02-12 20:46:59 +00:00
Julia Reynolds
463b8f9f31
Merge "Show topic settings inline if user has configured topics." into nyc-dev am: 597c6d8c5d
...
am: acfdf4b6ee
* commit 'acfdf4b6eeb4c6dd03aa54afad7aeb885e26a21f':
Show topic settings inline if user has configured topics.
2016-02-12 20:46:04 +00:00
Chong Zhang
c75059d2a4
Merge "Fix flicker when tapping quickly on dock divider"
2016-02-12 20:45:52 +00:00
Shreyas Basarge
6275d49007
Add defaultPeriodic to every authority
...
Adds a default periodic sync to every
authority on boot so that subscribedfeeds
adapter gets back its periodic sync if lost.
This change will bereverted in the next droidfood
build.
Change-Id: Icae76c2baafb471ad69d01a4c65023dc6f6525c0
2016-02-12 20:44:31 +00:00
Amith Yamasani
2a4ac4e5ef
Use hasInternetPermission method
...
Followup to Bug: 27165396
Change-Id: Ibdf6f5dd15197d4e19d7c7729612c13a02cdbf2b
2016-02-12 12:43:15 -08:00
Ben Wagner
e87aa6181e
Merge "Deduplicate font file mappings." into nyc-dev
...
am: 242afb7809
* commit '242afb7809aaca37a34e4fce4a895d8b5c5f67fd':
Deduplicate font file mappings.
2016-02-12 20:42:10 +00:00
Julia Reynolds
acfdf4b6ee
Merge "Show topic settings inline if user has configured topics." into nyc-dev
...
am: 597c6d8c5d
* commit '597c6d8c5de14340550313607d0925b8ee40fea9':
Show topic settings inline if user has configured topics.
2016-02-12 20:40:37 +00:00
Amith Yamasani
ffe4cee511
Merge "When the device boots up, netd works more than required" into nyc-dev am: b8849e6891
...
am: 4ab8fd7a70
* commit '4ab8fd7a707cd99b3b2a61329e09f10ae37cb32c':
When the device boots up, netd works more than required
2016-02-12 20:40:33 +00:00
Amith Yamasani
4ab8fd7a70
Merge "When the device boots up, netd works more than required" into nyc-dev
...
am: b8849e6891
* commit 'b8849e6891dd91bc62e90b5ccd78621dbf6e4093':
When the device boots up, netd works more than required
2016-02-12 20:35:17 +00:00
Ben Wagner
242afb7809
Merge "Deduplicate font file mappings." into nyc-dev
2016-02-12 20:32:03 +00:00
Julia Reynolds
597c6d8c5d
Merge "Show topic settings inline if user has configured topics." into nyc-dev
2016-02-12 20:31:55 +00:00
Amith Yamasani
b8849e6891
Merge "When the device boots up, netd works more than required" into nyc-dev
2016-02-12 20:27:55 +00:00
Sunny Goyal
c7ccff4b20
Changing hashmaps to sparseArrays and other similar conversions
...
Change-Id: I1905120a2dc109e8f383b973e599e2c23e005d0e
2016-02-12 12:25:28 -08:00
Jorim Jaggi
e54ddd62cc
Fix layout for full-screen floating windows am: 9f6798a936
...
am: 0c1edad116
* commit '0c1edad1169938157e53df8ec0abd5c42100b2d3':
Fix layout for full-screen floating windows
2016-02-12 19:40:23 +00:00
Jorim Jaggi
0c1edad116
Fix layout for full-screen floating windows
...
am: 9f6798a936
* commit '9f6798a9367cc6134f956c422107361db43c4212':
Fix layout for full-screen floating windows
2016-02-12 19:33:41 +00:00
Ben Wagner
fb95699364
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 fffcf0a31f )
2016-02-12 19:33:26 +00:00
Julia Reynolds
bdd3bce39b
Merge "Possibly fix deadlock." into nyc-dev am: a0424c729f
...
am: bae580272a
* commit 'bae580272a4559f4cfdfe8d9a4a7e19aad75967e':
Possibly fix deadlock.
2016-02-12 19:31:55 +00:00
Jorim Jaggi
9f6798a936
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
2016-02-12 19:31:07 +00:00
Selim Cinek
458df51de1
Merge changes If981a380,I48a8f882,I4b248b2f,Id9e6ce2a,Ib5239325, ... into nyc-dev am: 4f0e1e1d09
...
am: ea5b8849bc
* commit 'ea5b8849bc21ba1e42f122c89b3d8ccbee4246e1':
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
2016-02-12 19:30:49 +00:00
Adrian Roos
d2598d345b
Add setting for allowing remote input from keyguard am: 3aec638a7b
...
am: f86c39d1d7
* commit 'f86c39d1d7d4eadc40d34edb1b9e53969e130ee0':
Add setting for allowing remote input from keyguard
2016-02-12 19:29:48 +00:00
Ben Wagner
f4e5e773e6
Merge "Add support for gx font variation axes." into nyc-dev am: e2caaa9c8d
...
am: 1874e23beb -s ours
* commit '1874e23beb1872929479df3c2ac86cdae37f2c6e':
Add support for gx font variation axes.
2016-02-12 19:28:42 +00:00
Julia Reynolds
bae580272a
Merge "Possibly fix deadlock." into nyc-dev
...
am: a0424c729f
* commit 'a0424c729f32164fb17dc9d92978f84897d75c7b':
Possibly fix deadlock.
2016-02-12 19:07:02 +00:00
Selim Cinek
ea5b8849bc
Merge changes If981a380,I48a8f882,I4b248b2f,Id9e6ce2a,Ib5239325, ... into nyc-dev
...
am: 4f0e1e1d09
* commit '4f0e1e1d090089f5b0337d53fe77a90a1c796398':
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
2016-02-12 19:03:56 +00:00
Adrian Roos
f86c39d1d7
Add setting for allowing remote input from keyguard
...
am: 3aec638a7b
* commit '3aec638a7b7f7200f7c82bca527e6aec75440d82':
Add setting for allowing remote input from keyguard
2016-02-12 19:02:16 +00:00
Julia Reynolds
a0424c729f
Merge "Possibly fix deadlock." into nyc-dev
2016-02-12 19:00:43 +00:00
Julia Reynolds
0f50e4ebab
Possibly fix deadlock.
...
Bug: 27122790
Change-Id: I4361cc09e34ea71d7d69a54330ce52574c2b9b3d
2016-02-12 19:00:07 +00:00
Selim Cinek
4f0e1e1d09
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
2016-02-12 18:56:46 +00:00