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

1396 Commits

Author SHA1 Message Date
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
Deepanshu Gupta
8a4f39351f am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '48bf7b49bb361a4084e5fb4c6d0ae497a606c700':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 16:36:36 +00:00
Deepanshu Gupta
838e54826b am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '94d33cfce1f32af4480f941fdd6c9942bb203d2c':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 16:36:33 +00:00
Deepanshu Gupta
df8a15b31e am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'd4e6727d02f7507fdfd6cbbabd03d6e922127e4b':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 16:36:30 +00:00
Deepanshu Gupta
5f61e9b4ef am ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp 
* commit 'ed98abecad359ab1765ac1f698c8ba06dbd00745':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 16:36:28 +00:00
Deepanshu Gupta
520f585bc6 am 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
* commit '2cbe100a9bc6d2b3bf828432a1527f0ac239e575':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 16:36:25 +00:00
Deepanshu Gupta
2c167d0f6a am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
* commit '632c9e2dabc44b24f04c3418e4a3540b22db792b':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 16:36:22 +00:00
Deepanshu Gupta
e3b43270e8 am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'bdd8fbf6eae886dc3b2cd716745ede918773a2c4':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 16:31:50 +00:00
Deepanshu Gupta
45ca5ba7dc am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '01cdd3123f408dc41a2bd4786f3a943157ab6c69':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:47 +00:00
Deepanshu Gupta
9f9652587d am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit 'd094742d2e19371291409886bb80f070df099533':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 16:31:44 +00:00
Deepanshu Gupta
8c5c2410ae am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE] 
* commit '7bb8de580a451621480913d7839fd7eb784ab689':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 16:31:41 +00:00
Deepanshu Gupta
48bf7b49bb am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '69b3115e1c02f2b22165b93bd9bcc5c90ec69b12':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 16:31:38 +00:00
Deepanshu Gupta
94d33cfce1 am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '82d5bd98b77a9955e375b075e262639625c40232':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:35 +00:00
Deepanshu Gupta
d4e6727d02 am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'd5de1bd6305dc8885027504996602755b1e79099':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 16:31:31 +00:00
Deepanshu Gupta
ed98abecad am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp 
* commit '8a70bcef5a724906e3c35c58cb2266ee9c9e1b78':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 16:31:28 +00:00
Deepanshu Gupta
2cbe100a9b am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
* commit '40fea8b1bf689933e63941b5fa5e3379f82c88b5':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 16:31:23 +00:00
Deepanshu Gupta
632c9e2dab am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
* commit '065ce2e8b3e11ff8bb1699748edbd23d272bc8a6':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 16:31:20 +00:00
Deepanshu Gupta
9c00e6739c am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev 
* commit '2fb139e02c1e9d2d7c92acf813445a063e73d94f':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 16:31:05 +00:00
Deepanshu Gupta
bdd8fbf6ea am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit '877ae53586c3f7f5b788a40dfb0a58bef54a7446':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-13 02:20:10 +00:00
Deepanshu Gupta
01cdd3123f am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '669792b303b99a003bbcbf8d962f5be1debf9b63':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-13 02:20:07 +00:00
Deepanshu Gupta
d094742d2e am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit 'cda89ca02548c19250ae55671c055536b64b74f8':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-13 02:19:59 +00:00
Deepanshu Gupta
7bb8de580a am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE] 
* commit 'a2b34c96f1ef24d96854d1e23426dec7774510e8':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 02:19:56 +00:00
Deepanshu Gupta
69b3115e1c am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit 'e183855c1eb7baf750c67bb20e70fb887eba7af6':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 02:19:52 +00:00
Deepanshu Gupta
82d5bd98b7 am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit 'e5a2347bc6cf1506799136af4c9724275ca0247e':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 02:19:49 +00:00
Deepanshu Gupta
d5de1bd630 am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit '30505abeb6cda9d042ec41f2563d561714eac46b':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 02:19:46 +00:00
Deepanshu Gupta
1103ece28c am f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit 'f20c9c660edcce0fe90ba5f8464f726dcd51229e':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 02:02:56 +00:00
Deepanshu Gupta
42556c394b am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit '3990ec3490cc43a2690163f2a973b5ac6c4bdc46':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:02:54 +00:00
Deepanshu Gupta
202800b12d am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '4d69ca223b268d4ed93baf9d3c354e1df79d55ce':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 02:02:50 +00:00
Deepanshu Gupta
2fb139e02c resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev 
Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c
 2014-05-12 19:01:41 -07:00
Deepanshu Gupta
8a70bcef5a resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp 
Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8
 2014-05-12 18:57:34 -07:00
Deepanshu Gupta
f20c9c660e am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit '06c4f23d737082717f37f5f3583d9c12f4b64bf2':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 01:57:25 +00:00
Deepanshu Gupta
3990ec3490 am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'cdb87d8d83e8a76a4cf78d24d5c49ee8548eba1f':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 01:57:22 +00:00
Deepanshu Gupta
4d69ca223b am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit 'edae4e69512a7c9df1076fde70de83e15053a30a':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 01:57:18 +00:00
Deepanshu Gupta
40fea8b1bf am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
* commit '4b5da86d04200ba278b62ff99da91e212b87e9af':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 01:52:32 +00:00
Deepanshu Gupta
065ce2e8b3 am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
* commit '5c166c9c04b6ea9d4955830e7ba277be71f17a6f':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 01:52:28 +00:00
Deepanshu Gupta
9f2f5e776a am 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE] 
* commit '2d82586b96593b1b3b5280d77d5ae9a09df9d1fd':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 01:52:25 +00:00
Deepanshu Gupta
06c4f23d73 am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit '64dc0380127047ffcf135b6848c9150aa8dbed85':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 01:52:21 +00:00
Deepanshu Gupta
cdb87d8d83 am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'a59c27dd6674a31c875b0baa86519caec628ca2d':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 01:52:18 +00:00
Deepanshu Gupta
edae4e6951 am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '8a39c3afb29f2540b05319042e758dd4d5f73a1e':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 01:52:15 +00:00
Deepanshu Gupta
877ae53586 Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.

Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry-picked from bcbeaf83ca75e4a819377938fdf3ec1e07fa30a7)
 2014-05-06 14:02:46 -07:00
Deepanshu Gupta
669792b303 Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
For these font families, text was always rendered as italic. This
changeset fixes the issue.

Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry-picked from 5be65fda15c6f66067da3cc623811427e9d541e4)
 2014-05-06 14:02:46 -07:00
Deepanshu Gupta
cda89ca025 Fix a bug in Nine Patch library. [DO NOT MERGE] 
The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.

Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
(cherry-picked from 5bb3414d148f1309dade9333fe9b89c8d1c2f308)
 2014-05-06 14:02:46 -07:00
Deepanshu Gupta
a2b34c96f1 Optimize layout rendering in layoutlib [DO NOT MERGE] 
The height of a layout should be zero if it is assigned a layout_weight.
This way, the layout is measured only once and prevents spurious errors.

Bug: https://code.google.com/p/android/issues/detail?id=58398
Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a
(cherry-picked from 5712b5fc3fec0dc376e84f660f2fe0d1102c0cbb)
 2014-05-06 14:02:45 -07:00
Deepanshu Gupta
e183855c1e Add methods for Time_Delegate [DO NOT MERGE] 
Bug: http://b.android.com/65359
Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
(cherry-picked from 02cde9ceeb4c052ee273a5d809816dfd355ebb56)
 2014-05-06 14:02:45 -07:00
Deepanshu Gupta
e5a2347bc6 Fix NPE in layoutlib. [DO NOT MERGE] 
Change-Id: I36623304d83b344ea078044001577b8005a63c02
(cherry picked from commit 689c0dfe72a57c0555560012cbc6806375e7d4b7)
 2014-05-06 14:02:45 -07:00
Deepanshu Gupta
30505abeb6 Fix text size in Fake Action Bar. [DO NOT MERGE] 
The density multiplier was being applied twice to the title text in
the fake action bar.

Bug: 11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
(cherry-picked from 083d1562e00631630b5594462ce4a867a3508d8d)
 2014-05-06 14:02:44 -07:00
Deepanshu Gupta
5a7b3b65b6 Remove references to non-std Java classes. [DO NOT MERGE] 
Do not add the non-standard Java classes. Updates the references to all
non-standard classes to new classes in
com.android.tools.layoulib.create package. This also treats
java.lang.AutoCloseable which is part of Java 7 similarly so that we can
still run on Java 6.

This also adapts the cherrypick for this branch by updating references
to the non-standard Java classes present in this branch. This also
includes the following change that includes some changes that the
original cherrypick missed.
Change-Id: I76c87c74ee088778b37d1a7a7d531e0fde5c758f
commit: 1ed75bde09275c9f2bd1f81830e381ea864ac7f5

Change-Id: Iac5b272652e2780c9bb72d19f415d150948ca589
(cherry picked from 80c668f2a076e91d887dbf77776cd503ff88b0b4)
 2014-05-06 13:55:56 -07:00