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

677 Commits

Author SHA1 Message Date
Deepanshu Gupta
10395cbb5c Fix default level flags for bidi. [DO NOT MERGE] 
Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)
 2014-07-12 02:10:33 +00:00
Deepanshu Gupta
022d8a9f44 am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'bad112f23f09f8839b4b7294439b0fe725cc2034':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:30:05 +00:00
Deepanshu Gupta
bad112f23f am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'c8235b8e7446c849df10ff2f897d2a3743b4934d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:27:49 +00:00
Deepanshu Gupta
904b89c584 am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:14:52 +00:00
Deepanshu Gupta
295184bc71 am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:10:55 +00:00
Deepanshu Gupta
e87c63e0e4 am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:43:09 +00:00
Deepanshu Gupta
8782a12005 resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d
 2014-06-04 12:43:01 -07:00
Deepanshu Gupta
61fb578432 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:32:05 +00:00
Deepanshu Gupta
0ab0d875d4 am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '28f550f010045d5df9e7762a567fb0351499b846':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:30:53 +00:00
Deepanshu Gupta
ffbf24476c am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '083af20d9dc0d14eadd2ba03951579f88cd1f671':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:30:50 +00:00
Deepanshu Gupta
704954c96a am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:28:48 +00:00
Deepanshu Gupta
5f56ea8d80 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'f48ab8feec71419e574a2d2f08a29be87743ef07':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:24:25 +00:00
Deepanshu Gupta
f48ab8feec am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3b7c09b4336f421c489523c10278ecfbfb0708a7':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:10 +00:00
Deepanshu Gupta
3ff08eb6bf Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit 03c0735017a34bac9ea69600b8cf980775331f0e)
 2014-05-30 14:50:55 -07:00
Deepanshu Gupta
3b7c09b433 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit 08d2007b33838570a96c8df890f0757fa920904c)
 2014-05-30 14:50:39 -07:00
Deepanshu Gupta
03c0735017 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit 866d40fc39f7364d95085650244db59f52d4c002)
 2014-05-30 14:49:59 -07:00
Deepanshu Gupta
08d2007b33 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit a0fc1f46264e316449402525fbeb033138ec5f49)
 2014-05-30 14:49:59 -07:00
Deepanshu Gupta
fe6f30491f Remove @NonNull attribute [DO NOT MERGE] 
The tools prebuilt in this branch doesn't have the annotation.

Change-Id: I852f91c5202ed5f4c393d1226a4fa0b6fa4d63c1
 2014-05-30 14:49:51 -07:00
Deepanshu Gupta
866d40fc39 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit 79f45b43db4dfd605d1e7ddd2c71be4ef8285269)
 2014-05-30 12:13:42 -07:00
Deepanshu Gupta
a0fc1f4626 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit 8974a5e6d8408b4cd93f1befb05cc9b654b71e4a)
 2014-05-30 12:13:32 -07:00
Deepanshu Gupta
6e923e1b51 am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '90d57721692e45fe6259136296e3cd5b669443fc':
  Fix build
 2014-05-14 00:05:35 +00:00
Deepanshu Gupta
90d5772169 am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '209745a32f0a68584aba57acf7c8d1de633b1cda':
  Fix build
 2014-05-14 00:00:05 +00:00
Deepanshu Gupta
85ec144538 am f266873c: am 1c55797d: Fix build 
* commit 'f266873c8059e78410bf43c83fb8f0fd5bfe3362':
  Fix build
 2014-05-13 23:45:30 +00:00
Deepanshu Gupta
e0be42a9f9 am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] 
* commit '40bfb60efa0e92259a417a5cbfd6095759c678b7':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-13 23:40:37 +00:00
Deepanshu Gupta
f266873c80 am 1c55797d: Fix build 
* commit '1c55797d0e786b6594e769c2fa424e1b8386648e':
  Fix build
 2014-05-13 23:40:34 +00:00
Deepanshu Gupta
40bfb60efa Fix build due to incorrect merges [DO NOT MERGE] 
Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f
 2014-05-13 15:52:39 -07:00
Deepanshu Gupta
1c55797d0e Fix build 
remove a line that shouldn't have been merged into this branch.

The build will still be broken for this branch, but this will fix it for
many branches downstream.

Change-Id: I2f556636640eb823dc2834afae7b536e79b79607
 2014-05-13 15:47:04 -07:00
Deepanshu Gupta
ef24a5091b am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '900954e3cd135bf43db975961056e7661f26a6c6':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:07:40 +00:00
Deepanshu Gupta
900954e3cd am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '2100476ace68858bc7b7356b33aa525e38795592':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:02:19 +00:00
Deepanshu Gupta
964023c5dc am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '8bf73eae6c98532c8a597b885b948b9878555441':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 20:54:12 +00:00
Deepanshu Gupta
8bf73eae6c am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '0ad4f2cedde037c2b09a7f09c5f95f0984267c64':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 17:58:14 +00:00
Deepanshu Gupta
0ad4f2cedd resolved conflicts for merge of 7377c7be to jb-mr1-dev 
Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
 2014-05-13 10:44:24 -07:00
Deepanshu Gupta
5454be00b1 am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '5dae7fda38850a5146a6b8a4edbfd9aa96aea484':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 17:42:09 +00:00
Deepanshu Gupta
d388afada2 am b6de60e0: am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit 'b6de60e0020dbed906b1d275de17f8c615b2b242':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 17:42:06 +00:00
Deepanshu Gupta
b161d6ba7f am 673d9734: resolved conflicts for merge of 00d09649 to jb-mr1-dev 
* commit '673d9734c2d9b62ecd41dcac3c730d242952989e':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 17:42:00 +00:00
Deepanshu Gupta
5dae7fda38 am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '9359dc2e7d6bc671af3fee0c1dc540dd3685365c':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 17:40:55 +00:00
Deepanshu Gupta
b6de60e002 am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit 'df2da3d7c9f82ff2304f630f4ff9fc2cb3001c6f':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 17:40:52 +00:00
Deepanshu Gupta
673d9734c2 resolved conflicts for merge of 00d09649 to jb-mr1-dev 
Change-Id: Ib3c34a1989d4251c3ac4755c52fe05a81644930a
 2014-05-13 10:17:09 -07:00
Deepanshu Gupta
cc9e359699 am 5280c911: am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '5280c911d81a7db5ec8854850bef60d8b0951358':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 17:14:17 +00:00
Deepanshu Gupta
9978c0363e am 1867f58d: am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '1867f58d6ceebac899b60b029e34f3a1fcabba7f':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 17:14:12 +00:00
Deepanshu Gupta
8e015b7ba4 am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev 
* commit 'a5461ebfaebf3337a0cf1c752334f23de145a6d1':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 17:14:09 +00:00
Deepanshu Gupta
5280c911d8 am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '0df5ae65a91174c99d1af633b45b3a1a7861cd1c':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 17:11:26 +00:00
Deepanshu Gupta
1867f58d6c am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '3027b69e154cffc6e286caf90b0f9af01c473c14':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 17:11:20 +00:00
Deepanshu Gupta
a5461ebfae resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev 
Change-Id: I5c4634897882deb663f32d8148202d7c9189521d
 2014-05-13 09:40:35 -07:00
Deepanshu Gupta
0f26b51025 am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '9053261a5413f401168d25fa4a9749723b232949':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 16:36:56 +00:00
Deepanshu Gupta
627cab1257 am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '45693e50ecdae9b456e4974dd91758f9e25df2b4':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 16:36:50 +00:00
Deepanshu Gupta
effef17297 am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'e3b43270e87fd85a6281c91f2897233aac6b6397':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 16:36:48 +00:00
Deepanshu Gupta
c3a0c9f679 am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '45ca5ba7dc3b70dd39991217894eed114eefb1b8':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 16:36:45 +00:00
Deepanshu Gupta
835cbaa192 am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '9f9652587dd08e5a4f7c8195eb904cd0f0c3f6c4':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 16:36:42 +00:00
Deepanshu Gupta
ce9e87f743 am 8c5c2410: am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE] 
* commit '8c5c2410ae9df60d9462784370965a0417e06fa4':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 16:36:39 +00:00