910 Commits

Author SHA1 Message Date
Deepanshu Gupta
61d3dea672 am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]
* commit '8c8bb83e623e1932853230cb25a3330fcedb73ff':
  Change font family name. [DO NOT MERGE]
2014-07-08 23:29:03 +00:00
Deepanshu Gupta
8e11659a43 Change font family name. [DO NOT MERGE]
During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)
2014-07-07 22:52:06 +00:00
Deepanshu Gupta
1595c61d2f am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '5a49fc331ec7d5aa2532d650c32ea68733cbd5c0':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
2014-06-18 00:15:35 +00:00
Deepanshu Gupta
c57b410c8e Add a script to rename fonts for SDK. [DO NOT MERGE]
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.

This commit is a combination of 5 commits:
e0660d31c256e02e5f5e2967508a7205d1f62f86
7e149f02c4e4403101e7e0e88af36cd4ab6f3554
66d3314301a8983c7070a15ea68daacc7300b7f2
c6364fd90de1600526d3431ce0740b6b856e48f0
2d8c52dc4502b8407705d5b6efe628cb657b20b4

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
2014-06-12 15:08:46 -07:00
Deepanshu Gupta
9c80488e11 LayoutLib fixes for API 20 [DO NOT MERGE]
Fixes a bunch of issues with delegate method signatures.

Also cherrypicked commit 664d6f1fe4d6dfa742b3e98051f924dbc190f8ca
which is needed in this branch also.

Bug: 15492736
Change-Id: If99ff279b0d0cabe22942da27388ecb4b800c330
2014-06-12 19:48:38 +00:00
Deepanshu Gupta
905e113f97 am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit '03df93bcb854eedc600ef0120fd238ec974c44a1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:48:19 +00:00
Deepanshu Gupta
5cde33a6ff am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit 'dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:41:47 +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
1410489677 am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit 'e4aa31382139ee2e319110fbfff402e0c6315952':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:29:06 +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
Craig Mautner
81dfc082d2 Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev 2014-06-03 22:41:38 +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
8af310c0c6 am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '8f6a9a658a8a06eb4f11cfff5dca7edf3c7462ad':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
2014-06-03 20:29:01 +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
Craig Mautner
228742d278 Force all windows to redraw before unblanking screen
The screen turning on would show windows as they were when the screen
turned off. This fix forces all showing windows to redraw first and
only then allow the screen to turn on.

Fixes bug 15092354.

Change-Id: I349995bf6446d6c462dccdc2b599bab9ab0ab2c8
2014-06-02 20:29:38 -07: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
79f45b43db 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 f542f28a31b38a4e454535a1fea63968811b418c)
2014-05-30 12:00:54 -07:00
Deepanshu Gupta
8974a5e6d8 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 e21c7ec8a02922a6bec19436897f9ee02be3d6c2)
2014-05-30 11:59:59 -07:00
Jeff Brown
61116acdc6 Fix build.
Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
2014-05-20 22:16:25 -07:00
Deepanshu Gupta
7dfe1fdac6 am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
* commit 'c289ec6b465648d7d93e6f2dc9ed28822683f7d6':
  Fix build
2014-05-14 00:31:15 +00:00
Deepanshu Gupta
3a559d56a6 am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
* commit 'b5b4756565a5f74c6eb2ca7f90ac839a4289daae':
  Fix build
2014-05-14 00:21:33 +00: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
21dc46b14d am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev
* commit '569dc64cd6b0bb7bdfec97967b192d2a706e3f81':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
2014-05-13 21:33:07 +00:00
Deepanshu Gupta
69ab594625 am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev
* commit 'fcfb8801b27fd40ff27c380b8bad9b9a210effca':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
2014-05-13 21:23:47 +00: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
70efbad064 am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp
* commit 'bd5a3e6510e83b161a0e40c191d349524ae4a8e6':
  resolve conflicts for merge 5a7b3b65 correctly
2014-05-13 17:58:17 +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
872a5a1a93 am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
* commit '01fefec9397569cf9c7c5b599c16126f1b4d6870':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-13 17:55:41 +00:00