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

131642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
52b49665f5 am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'eff94bc3647c23c223abe4946595d51d80985eec':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:41:24 +00:00
Deepanshu Gupta
ec1b4df6d2 resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 2014-05-13 13:40:14 -07:00
Deepanshu Gupta
9358cf04dc am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'ccf6b34799efb14e5883ed4901ff03bf75ac4c1c':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:38:17 +00:00
Deepanshu Gupta
f46900c5ea am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '87a54055e61918986021eb5e1e3dbefe40839367':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:38:15 +00:00
Deepanshu Gupta
6dad59e146 am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '85b751949b3d383494523bb98b016157d76787f3':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:38:12 +00:00
Aaron Whyte
8452776b95 am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 
* commit '5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
 2014-05-13 20:36:31 +00:00
Deepanshu Gupta
eff94bc364 am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '8c19c6a17d8a019086a36988937462acfb6b830f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:36:24 +00:00
Deepanshu Gupta
ccf6b34799 am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'a154687620a6d53f17c7abc36d419884cd6df2b7':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:33:33 +00:00
Deepanshu Gupta
87a54055e6 am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '5878115a6e19041439b335efae066862e21775a1':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:33:30 +00:00
Deepanshu Gupta
85b751949b resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 2014-05-13 13:32:59 -07:00
Aaron Whyte
5ff35f8a7f Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 2014-05-13 20:32:21 +00:00
Deepanshu Gupta
a154687620 am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '7ef276450f3157cc68f714b0d5805319e6f4c555':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:31:33 +00:00
Deepanshu Gupta
8c19c6a17d am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '16f3a6167bdcbd49e47d843fcb43fe9ffd461531':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:30:39 +00:00
Deepanshu Gupta
5878115a6e resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 2014-05-13 13:29:07 -07:00
Deepanshu Gupta
16f3a6167b am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'c0e9c66d7d59873443714cc19e5cea8c044931bb':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:27:46 +00:00
Jorim Jaggi
58bfed927d Merge "Keep QS header appearance and unlock icon in SHADE_LOCKED." 2014-05-13 20:18:00 +00:00
Jorim Jaggi
2042ef2390 Keep QS header appearance and unlock icon in SHADE_LOCKED. 
Also goes to shade locked when the user doesn't have a security
pattern at all, to keep the appearance as close as possible
when expanding a notification.

Change-Id: I7af899df545ff8cefedc8be8feebd769bdadcfa9
 2014-05-13 22:17:23 +02:00
George Mount
d8d99984c5 Merge "Add view name to Transition matching." 2014-05-13 20:08:20 +00:00
George Mount
30da61d477 Add view name to Transition matching. 
Bug 14625214

Change-Id: Ia1b21e6bd0ea4892b504746e582aeb175e0f0506
 2014-05-13 13:07:06 -07:00
Jim Miller
50a2fb9ea7 Merge "Don't clear the password field when window focus changes." 2014-05-13 20:05:18 +00:00
Deepanshu Gupta
c3f406ab9b am cf768044: (-s ours) am e9550087: am 874040d1: am 84f5acea: am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE 
* commit 'cf768044cdbef02ba9c0d44f33c9f17735f91455':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 19:29:32 +00:00
Deepanshu Gupta
74818cbafb am 357dd223: am c4ce0761: am b59cac72: am 382a0c70: am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit '357dd2234109aeccacb1975f269113c02aa563ed':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 19:29:29 +00:00
Deepanshu Gupta
cf768044cd am e9550087: am 874040d1: am 84f5acea: am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit 'e95500878c5a36b9b930aaf0c2bdc9cfe4601f1e':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 19:24:23 +00:00
Deepanshu Gupta
357dd22341 am c4ce0761: am b59cac72: am 382a0c70: am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit 'c4ce0761187fd2d8ab6d2cf402e0484682c8480a':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 19:24:20 +00:00
Deepanshu Gupta
e95500878c am 874040d1: am 84f5acea: am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '874040d10d5ad3b7235f24779c6e9cc142326df0':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 19:17:15 +00:00
Deepanshu Gupta
c4ce076118 am b59cac72: am 382a0c70: am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit 'b59cac7255e04a97ea230484ee6602836ebd669b':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 19:17:12 +00:00
George Mount
e8f5a255e0 Merge "Disallow makeSceneTransitionAnimation without FEATURE_CONTENT_TRANSITIONS" 2014-05-13 19:14:16 +00:00
George Mount
0ab4c72914 Merge "Change sharedElementName to viewName." 2014-05-13 19:13:28 +00:00
Deepanshu Gupta
874040d10d am 84f5acea: am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '84f5aceabd57f349b0e43c0cf45bc2ff76873ee1':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 19:12:52 +00:00
Deepanshu Gupta
b59cac7255 am 382a0c70: am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit '382a0c70bf4f972034ee95059b8e29758ce08607':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 19:12:48 +00:00
Deepanshu Gupta
84f5aceabd am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '0b878070ed6f20580508a921ab0babff9826931b':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 19:07:35 +00:00
Deepanshu Gupta
382a0c70bf am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit '3d9c18f27059f1b242690dec400c90c78db1e527':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 19:07:32 +00:00
Deepanshu Gupta
4cf7965767 am d3a91985: am f316c286: am 9a5d6556: am c174bdcd: am 76cc9bcc: (-s ours) am 6d091cdb: am 2d84de2f: am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NO 
* commit 'd3a91985bb0c16dc523047b09121a24898c8e2f3':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 19:03:06 +00:00
Deepanshu Gupta
496c1a9353 am 09ba39ad: am 73dda53f: am 9141c288: am 90c30544: am d23b318c: (-s ours) am 5806ec71: am f29a0516: am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT 
* commit '09ba39ad5bd748eef958e0e5f6a2041eb3dd1067':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 19:03:03 +00:00
Deepanshu Gupta
61d38732a5 am b8ca5088: am 0dff67ba: am 1d7c7eaf: am 2ffe14b8: am 7bbd0358: (-s ours) am b110aa8c: am 41764152: am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in lay 
* commit 'b8ca50887a9e6a70f91906084747c95aae56f516':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 19:02:59 +00:00
Deepanshu Gupta
2eba6ba22b am 2d2801c2: (-s ours) am 8446919f: am ef77c00d: am 9c30d2e8: am ceb9b606: (-s ours) am 4024fe96: am 28c76e3e: am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '2d2801c295b4acc3ce29247b30bd814e8b2083b1':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 19:02:56 +00:00
Deepanshu Gupta
19dbb00bb1 am 79feb7c2: am 81f4b8e1: am b806bde9: am 7475771a: am 7be53b24: am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
* commit '79feb7c2d72e3efe9a35bcfcc5eda67c9d4a8d05':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 19:02:52 +00:00
Deepanshu Gupta
0b878070ed am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '61b1fd5cd9238db5f5970c30cc46dc5087b229cb':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 19:02:20 +00:00
Deepanshu Gupta
3d9c18f270 am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit '9bdf54d3d7421c052013eb2200afbd18e3c9b48a':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 19:02:17 +00:00
Deepanshu Gupta
2c648c6e7e am 0fb28eab: (-s ours) am dc11e882: am 561fc1b6: am 99b33914: am 3f615bf2: (-s ours) am e0d3e66d: am 2f8da100: am 81ac665c: (-s ours) am 060836bd: am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '0fb28eab21e57bc4f1348c0e1b580df52927ce4c':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 18:57:52 +00:00
Deepanshu Gupta
d7d7369402 am 0c556934: (-s ours) am c7832db5: am 1f21b31e: am 0c2aeb4a: am 8816bdfa: (-s ours) am 39daf02e: am 1eadb79e: am fd8af673: (-s ours) am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '0c5569347544c163fbefd1a9b01486bb1634a0fd':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:57:49 +00:00
Deepanshu Gupta
7ccb45ad25 am f79bb639: (-s ours) am 3dbb1123: am a42d321c: am 56d3c9d1: am 851aece2: (-s ours) am a63a1f9b: am 910c7153: am be0c94ea: (-s ours) am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'f79bb63988d5d4db5e2c4653c4244f56f49549ae':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:57:46 +00:00
Deepanshu Gupta
158d601367 am e72f2c47: am 443019c3: am df7b20bd: am 0ac96e70: am 1ba65c7a: am af6dcd4f: am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit 'e72f2c477d18c2cc104335f9e804a8b3d09c6290':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:57:43 +00:00
Deepanshu Gupta
d3a91985bb am f316c286: am 9a5d6556: am c174bdcd: am 76cc9bcc: (-s ours) am 6d091cdb: am 2d84de2f: am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit 'f316c286cb05574680ad3669702dc42a899fccd9':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 18:57:38 +00:00
Deepanshu Gupta
09ba39ad5b am 73dda53f: am 9141c288: am 90c30544: am d23b318c: (-s ours) am 5806ec71: am f29a0516: am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit '73dda53fffec4593efa5f74657604f80e0b6a023':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 18:57:35 +00:00
Deepanshu Gupta
b8ca50887a am 0dff67ba: am 1d7c7eaf: am 2ffe14b8: am 7bbd0358: (-s ours) am b110aa8c: am 41764152: am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO N 
* commit '0dff67ba2bc7a5900fa955f00bdea58386e00519':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 18:57:32 +00:00
Deepanshu Gupta
2d2801c295 am 8446919f: am ef77c00d: am 9c30d2e8: am ceb9b606: (-s ours) am 4024fe96: am 28c76e3e: am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '8446919f61a68f43bde924bafd3699af9ba79c59':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 18:57:29 +00:00
Deepanshu Gupta
79feb7c2d7 am 81f4b8e1: am b806bde9: am 7475771a: am 7be53b24: am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
* commit '81f4b8e19eb4c89bb4eb71e6f0c08aacec377593':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 18:57:25 +00:00
Deepanshu Gupta
61b1fd5cd9 am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit 'e14b24f3a0c39c2e3755b55cca2600e12620ee32':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 18:57:04 +00:00
Deepanshu Gupta
9bdf54d3d7 am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 
* commit '41b3ef3ae266ea766ef38947e2d5f01c55006735':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 18:57:01 +00:00