Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,245 Commits 3 Branches 0 Tags
906bf903b4c2160080c53a6103494de40fa00d81
Commit Graph

4568 Commits

Author SHA1 Message Date
Robert Carr
4d1cd18333 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 am: b9d2502eac 
am: 45c6eb2164

* commit '45c6eb21648f9977057471d1f41beb275512a449':
  Prepare to replace windows across recreate().

Change-Id: I08c6f599d36fabb4f52ba23e9794c28203cc65b5
 2016-05-05 19:57:27 +00:00
Robert Carr
b9d2502eac Merge "Prepare to replace windows across recreate()." into nyc-dev 
am: ea162c3c79

* commit 'ea162c3c7992b01d8d56766a94e56a0cee3fe3b2':
  Prepare to replace windows across recreate().

Change-Id: I3f78aa81d76e0a71f616037c531e7755760b41cf
 2016-05-05 19:47:36 +00:00
TreeHugger Robot
ea162c3c79 Merge "Prepare to replace windows across recreate()." into nyc-dev 2016-05-05 19:38:17 +00:00
Diego Perez
5dc82fad17 Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev am: e37ecbdede am: e8498819f8 
am: 9e1287f989

* commit '9e1287f9890dc40d46444a4447c90473f621f0f8':
  Add missing delegate in Bitmap_Delegate

Change-Id: Ie05e3eea7fa2ba62df504a0d8b15c2c4629ff650
 2016-05-05 12:32:47 +00:00
Diego Perez
e8498819f8 Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev 
am: e37ecbdede

* commit 'e37ecbdede9bb3b4fadba359891b13eb5cd6c697':
  Add missing delegate in Bitmap_Delegate

Change-Id: Ib8e9fd1772a605ba75ffd7cf868fa654c50cb1e5
 2016-05-05 12:27:45 +00:00
Diego Perez
e37ecbdede Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev 2016-05-05 12:21:35 +00:00
Robert Carr
77bdfb512f Prepare to replace windows across recreate(). 
When the activity locally recreates itself, nothing
on the server side is able to prepare preserving windows,
or replacing windows. The activity was trying to defer
removing the old window, but it was just waiting
until the new one was created, not until it was drawn,
thus resulting in a flicker. It's easy to backpack on the
existing replacement infrastructure.

Bug: 28221875
Change-Id: I55fc4ca78e9e11809473fedd8b30b6a6350cf852
 2016-05-04 12:40:39 -07:00
Chih-Hung Hsieh
d53e3bed1c Fix google-explicit-constructor warnings. 
Bug: 28341362
Change-Id: I080090d50f1a368a4e7c1a0732297bb6a295e34f
 2016-05-03 10:02:51 -07:00
Doug Felt
c3dbfc397c Merge "Patch fontchain_lint to exclude modern_pentathlon." into nyc-dev am: 398342f9b6 am: e13a3252f9 
am: 3195fab770

* commit '3195fab770a480ac621fb9908213183688e4f627':
  Patch fontchain_lint to exclude modern_pentathlon.

Change-Id: I7f68560bbd64bbcbb0b7c7de4d295477ed61fd7c
 2016-04-29 21:35:12 +00:00
Doug Felt
e13a3252f9 Merge "Patch fontchain_lint to exclude modern_pentathlon." into nyc-dev 
am: 398342f9b6

* commit '398342f9b66046582eff7d98e252d435475d6a92':
  Patch fontchain_lint to exclude modern_pentathlon.

Change-Id: I7bdd78e1fef0f3debdfd97d7c742a4d0987101e1
 2016-04-29 21:30:45 +00:00
Raph Levien
398342f9b6 Merge "Patch fontchain_lint to exclude modern_pentathlon." into nyc-dev 2016-04-29 21:25:20 +00:00
Doug Felt
ce51db00ec Patch fontchain_lint to exclude modern_pentathlon. 
Fix build breakage.
Bug: 28426800

Change-Id: Idcc8f1b66014b25758c163d908d34f06011d9927
 2016-04-29 14:17:57 -07:00
Deepanshu Gupta
836bbe9fa6 Merge "Add namespace before attr name in defPropMap" into nyc-dev am: 4c5e7a740a am: e47c4aec7d 
am: 6291e0ba4f

* commit '6291e0ba4f5cbee39ad70cdbd27117bdad531797':
  Add namespace before attr name in defPropMap

Change-Id: Ib1c40ddd52c42da023abff277379e908509778f0
 2016-04-29 20:17:49 +00:00
Deepanshu Gupta
40631eeca8 Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev am: 2385e2184a am: f3cdbe2254 
am: f593ca4d3d

* commit 'f593ca4d3d15d1c3f57d2d54f9cb250c23f4f90e':
  Revert "Switch LayoutLib to Java 8"

Change-Id: I899ace3ef0e6856320141de0471d88a7eab78e7a
 2016-04-29 20:17:41 +00:00
Deepanshu Gupta
6291e0ba4f Merge "Add namespace before attr name in defPropMap" into nyc-dev am: 4c5e7a740a 
am: e47c4aec7d

* commit 'e47c4aec7d8e1ab2d0c30c95b3951a8e2367a4b2':
  Add namespace before attr name in defPropMap

Change-Id: I4acb3c65e3e0012fed50b2571fede7504ec42a86
 2016-04-29 20:12:53 +00:00
Deepanshu Gupta
f593ca4d3d Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev am: 2385e2184a 
am: f3cdbe2254

* commit 'f3cdbe22540ddc692adef7e00b30b75ac38d22f8':
  Revert "Switch LayoutLib to Java 8"

Change-Id: I2b97993e7f6803e0352d1734db74891bee0b75d7
 2016-04-29 20:12:50 +00:00
Deepanshu Gupta
5d76be778b Merge "Add namespace before attr name in defPropMap" into nyc-dev 
am: 4c5e7a740a

* commit '4c5e7a740a632829b48b2324f80a43ab94ac7551':
  Add namespace before attr name in defPropMap

Change-Id: I93619d0e2a28ef30b43e1fe8361142da3122cdda
 2016-04-29 20:10:34 +00:00
Deepanshu Gupta
ba4b9ab111 Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev 
am: 2385e2184a

* commit '2385e2184a68318a582f075bcd483baa35c776b4':
  Revert "Switch LayoutLib to Java 8"

Change-Id: Ie231af95e2d2361419db0ffc03c3abff4c6f1cc3
 2016-04-29 20:10:29 +00:00
Deepanshu Gupta
4c5e7a740a Merge "Add namespace before attr name in defPropMap" into nyc-dev 2016-04-29 20:06:01 +00:00
Deepanshu Gupta
2385e2184a Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev 2016-04-29 20:05:39 +00:00
Rohit Agrawal
ab45664130 Merge "AAPT: ProGuard config for components in main dex." into nyc-dev 2016-04-29 01:19:08 +00:00
Adam Lesinski
0d9f32da56 Merge "AAPT: ProGuard config for components in main dex." am: da66fa7526 
am: 1d58c18081

* commit '1d58c18081a2f17afc964de2f261a699e11d6f02':
  AAPT: ProGuard config for components in main dex.

Change-Id: I156e1805ad64798be891747a81561589d9543424
 2016-04-28 20:18:21 +00:00
Adam Lesinski
da66fa7526 Merge "AAPT: ProGuard config for components in main dex." 2016-04-28 20:06:19 +00:00
Adam Lesinski
5fcf5d4fec Merge "AAPT2: Accept a file with arguments when argument list is too long" into nyc-dev am: 28d6c1e493 am: 461be97e30 
am: e59d48398f

* commit 'e59d48398f983b822191ea3096499bdd0793840a':
  AAPT2: Accept a file with arguments when argument list is too long

Change-Id: Iad1d2b91109b0d1c78739c3fa3f31da5e0704f12
 2016-04-28 20:05:24 +00:00
Adam Lesinski
461be97e30 Merge "AAPT2: Accept a file with arguments when argument list is too long" into nyc-dev 
am: 28d6c1e493

* commit '28d6c1e49313bcb4823541d0114b2ff04f8cb446':
  AAPT2: Accept a file with arguments when argument list is too long

Change-Id: I85c1aaa9818e9331a458892898204617af453b02
 2016-04-28 19:44:21 +00:00
Adam Lesinski
28d6c1e493 Merge "AAPT2: Accept a file with arguments when argument list is too long" into nyc-dev 2016-04-28 19:34:31 +00:00
Adam Lesinski
c51562cf5a AAPT2: Accept a file with arguments when argument list is too long 
Bug:22775504
Change-Id: Ife73d4e4611016c9ee7b56264bc6a765c54beba3
 2016-04-28 11:14:38 -07:00
Rohit Agrawal
682583c890 AAPT: ProGuard config for components in main dex. 
Create an analogue of "aapt -G" which outputs a proguard configuration
that keeps only components which need to be in the main dex.

Bug: 27383099
Bug: 28425556

Change-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1
(cherry picked from commit 86229cb622)
 2016-04-27 19:50:55 +00:00
Chih-Hung Hsieh
c6baf563ba Fix google-explicit-constructor warnings. 
Bug: 28341362
Change-Id: Ibdd6a210bb7ff228e3624cc319169f77aca3b51e
 2016-04-27 11:38:12 -07:00
Rohit Agrawal
6ba873faec AAPT: ProGuard config for components in main dex. 
Create an analogue of "aapt -G" which outputs a proguard configuration
that keeps only components which need to be in the main dex.

BUG: 27383099

Change-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1
(cherry picked from commit 86229cb622)
 2016-04-27 11:26:55 -07:00
Deepanshu Gupta
a43c4fa09f Add namespace before attr name in defPropMap 
Change-Id: I36d094fb69d5f5ce0aebde04960ffcd19c27a2eb
 2016-04-26 15:19:31 -07:00
Rohit Agrawal
34314e83b8 Merge "AAPT2: ProGuard config for components in main dex." 2016-04-22 23:28:39 +00:00
Rohit Agrawal
e49bb30dab AAPT2: ProGuard config for components in main dex. 
Create an analogue of "aapt2 --proguard" which outputs a proguard
configuration that keeps only components which need to be in the main
dex.

Bug: 27383099

Change-Id: I61d652bfcdfc18e1614e852bd6f7540efd15f780
 2016-04-22 14:40:40 -07:00
Svetoslav Ganov
d1bd91aae8 Merge "Disallow disable of the system shared libs." into nyc-dev am: 5a91b61 am: 50d08f8 
am: 115ee83

* commit '115ee8340fd0ef4090550f046e2da51f476d32c0':
  Disallow disable of the system shared libs.

Change-Id: I9f96c94d6a0007ea602ef0c923e9079dceff4094
 2016-04-22 21:37:28 +00:00
Svetoslav Ganov
115ee8340f Merge "Disallow disable of the system shared libs." into nyc-dev am: 5a91b61 
am: 50d08f8

* commit '50d08f81d7c9e614f2a3f23fd815bbc183419874':
  Disallow disable of the system shared libs.

Change-Id: I689b99c36e7037ef4efbcbccea04be33e442c84e
 2016-04-22 21:09:55 +00:00
Svetoslav Ganov
599bf728de Merge "Disallow disable of the system shared libs." into nyc-dev 
am: 5a91b61

* commit '5a91b615232374084a45752d7c09c25265e263ed':
  Disallow disable of the system shared libs.

Change-Id: I111c0285b73ffa64594c39b54d18d5d3ff670953
 2016-04-22 21:07:11 +00:00
Svetoslav Ganov
5a91b61523 Merge "Disallow disable of the system shared libs." into nyc-dev 2016-04-22 21:03:30 +00:00
Diego Perez
d7d2119fe3 Add missing delegate in Bitmap_Delegate 
New nativeCopyAshmemConfig

Change-Id: I8aedb0df827ac8d8091a9457bc341c1047b5a539
 2016-04-22 19:00:39 +01:00
Rohit Agrawal
86229cb622 AAPT: ProGuard config for components in main dex. 
Create an analogue of "aapt -G" which outputs a proguard configuration
that keeps only components which need to be in the main dex.

BUG: 27383099

Change-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1
 2016-04-21 18:00:53 -07:00
Diego Perez
a7c802b359 Merge "Separate measure so it can only run inflate if needed" into nyc-dev am: 3874597 
am: e4ad64b

* commit 'e4ad64b486699fe02b8551886ac5ab25db6b2c6d':
  Separate measure so it can only run inflate if needed

Change-Id: I928a8b8179c67ff77807b6ad479fdbbb72273c9b
 2016-04-19 07:41:22 +00:00
Diego Perez
1de566b58b Merge "Separate measure so it can only run inflate if needed" into nyc-dev 
am: 3874597

* commit '38745971c266f5fca692ef284e1e3b4d38af1a41':
  Separate measure so it can only run inflate if needed

Change-Id: Id52cf5e5c211d8c0f2363e0e349669a1c1f4ca40
 2016-04-19 07:38:42 +00:00
Diego Perez
38745971c2 Merge "Separate measure so it can only run inflate if needed" into nyc-dev 2016-04-19 07:34:17 +00:00
Adam Lesinski
d699f726ce Merge "SettingsLib: Build with AAPT2" into nyc-dev 
am: 0b1a203

* commit '0b1a203830f49b8998692873c161a8fb7c7ab9cb':
  SettingsLib: Build with AAPT2

Change-Id: Id8c103e38a78b13598bcf7d50d51239c08c22ca1
 2016-04-16 07:06:09 +00:00
Adam Lesinski
0b1a203830 Merge "SettingsLib: Build with AAPT2" into nyc-dev 2016-04-16 07:01:08 +00:00
Diego Perez
39e540caff Separate measure so it can only run inflate if needed 
This allows to only do inflate + measure and not to render.

Change-Id: I4be08513728b656f699e9115e14cf618d95b538a
 2016-04-15 11:38:19 +01:00
Adam Lesinski
5ff3ad6312 SettingsLib: Build with AAPT2 
Bug:22775504
Change-Id: I2e5015235384d124418d32186daa190f38e1c5b3
 2016-04-14 14:45:21 -07:00
Deepanshu Gupta
21e1f3c5ad Merge "Return complete properties map instead of per view" into nyc-dev 
am: e70464e

* commit 'e70464e11694712d62092ac3a623c32fe6d5e8a5':
  Return complete properties map instead of per view

Change-Id: I40f801e0f1daa9240af11d93dbe52cc17bd29ac8
 2016-04-14 19:48:58 +00:00
Deepanshu Gupta
e70464e116 Merge "Return complete properties map instead of per view" into nyc-dev 2016-04-14 19:42:16 +00:00
Deepanshu Gupta
eaf1853b98 Return complete properties map instead of per view 
Change-Id: Ib7c71606d1bf43bbaa80f5601a8508d7aa49d953
 2016-04-14 12:38:23 -07:00
Svetoslav Ganov
a9c2500a68 Disallow disable of the system shared libs. 
bug:28173410

Change-Id: If731f2d90312a083bb940f83431ba3eccf213947
 2016-04-13 19:31:40 -07:00