git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Deepanshu Gupta [Tue, 13 May 2014 18:05:48 +0000 (18:05 +0000)]

am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

* commit '3c9fceaeb4a00c1f9b9728fa703d97894e718e81':
Layoutlib tests now check methods return value [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:05:46 +0000 (18:05 +0000)]

am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]

* commit '07009057fee65896114a3c83bd762f6b22e1b645':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:05:44 +0000 (18:05 +0000)]

am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

* commit '85c5cdcd587c64a9e80ac51beb134d9547faae54':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:05:41 +0000 (18:05 +0000)]

am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]

* commit '488f624798837cf4fa441dce8675da7e8cb67788':
Fix a bug in Nine Patch library. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:05:39 +0000 (18:05 +0000)]

am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

* commit '9f00e655db5b2b7c3527c20b60dc816eee6eff1d':
Optimize layout rendering in layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:02:38 +0000 (18:02 +0000)]

am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

* commit '627cab1257bbd80e74ad5db1963aeedbe056b462':
Layoutlib tests now check methods return value [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:02:35 +0000 (18:02 +0000)]

am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]

* commit 'effef17297dffc05511597ccc0f437deb278647f':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:02:32 +0000 (18:02 +0000)]

am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

* commit 'c3a0c9f679cf18a512ca194e14a74dde852af831':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:02:29 +0000 (18:02 +0000)]

am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]

* commit '835cbaa192f324ec14361afc700cc44a6bfa47b7':
Fix a bug in Nine Patch library. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:58 +0000 (17:57 +0000)]

am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

* commit 'c233bb65bc10c20fa74fac55461a35c290cfb5f9':
Add methods for Time_Delegate [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:56 +0000 (17:57 +0000)]

am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '8cf3343dc3e174f2459c21a1f75cf869c36f02c2':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:52 +0000 (17:57 +0000)]

am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'd62dcc2958b75ec855f93f2b116ce47b1c5d8ecf':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:41 +0000 (17:57 +0000)]

am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

* commit '6f58831c64d01df7e0a80bcb47b54ea7a53a2e14':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:55:56 +0000 (10:55 -0700)]

resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

Change-Id: I6d3a92e8d3853069c1d8cb3399d6dfcb5b58da83

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:54:29 +0000 (17:54 +0000)]

am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

* commit '8a4f39351f5784c81501462fc84d6fe199bdedca':
Add methods for Time_Delegate [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:54:26 +0000 (17:54 +0000)]

am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '838e54826bbb03cec41684340c63be993d2dc160':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:54:23 +0000 (17:54 +0000)]

am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'df8a15b31ec4c72042f80a90365867939bddffd1':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:51:28 +0000 (10:51 -0700)]

resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:44:40 +0000 (17:44 +0000)]

am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

* commit 'dd8ebf1e15ffa78785307698551357fe80ea3775':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:23:22 +0000 (10:23 -0700)]

resolved conflicts for merge of 520f585b to jb-mr1.1-dev

Change-Id: I3982d8cd6585e6d4a3a9cf5b1d78f01f0e4ced6b

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:14:10 +0000 (17:14 +0000)]

am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '69bae78787a01b2fe4f2ba8e3c388c31f0989cb4':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:14:07 +0000 (17:14 +0000)]

am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

* commit 'a43aaf00b583e8a88681cdcc6ebe1ae2c52f6f20':
Fix CalendarView to show the right labels. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:12:27 +0000 (17:12 +0000)]

am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '2c167d0f6a370f9272ef24746222772586c1758c':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:49:18 +0000 (09:49 -0700)]

resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:50 +0000 (16:36 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:48 +0000 (16:36 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:45 +0000 (16:36 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:42 +0000 (16:36 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:39 +0000 (16:36 +0000)]

am 8c5c2410: am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]

* commit '8c5c2410ae9df60d9462784370965a0417e06fa4':
Optimize layout rendering in layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:36 +0000 (16:36 +0000)]

am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

* commit '48bf7b49bb361a4084e5fb4c6d0ae497a606c700':
Add methods for Time_Delegate [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:33 +0000 (16:36 +0000)]

am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '94d33cfce1f32af4480f941fdd6c9942bb203d2c':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:30 +0000 (16:36 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:28 +0000 (16:36 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:25 +0000 (16:36 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:22 +0000 (16:36 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:53 +0000 (16:31 +0000)]

am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

* commit 'c9a4badb54320f8c52d2da06a762b5e6eef00ee0':
Layoutlib tests now check methods return value [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:50 +0000 (16:31 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:47 +0000 (16:31 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:44 +0000 (16:31 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:41 +0000 (16:31 +0000)]

am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]

* commit '7bb8de580a451621480913d7839fd7eb784ab689':
Optimize layout rendering in layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:38 +0000 (16:31 +0000)]

am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

* commit '69b3115e1c02f2b22165b93bd9bcc5c90ec69b12':
Add methods for Time_Delegate [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:35 +0000 (16:31 +0000)]

am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '82d5bd98b77a9955e375b075e262639625c40232':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:31 +0000 (16:31 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:28 +0000 (16:31 +0000)]

am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp

* commit '8a70bcef5a724906e3c35c58cb2266ee9c9e1b78':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:23 +0000 (16:31 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:20 +0000 (16:31 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:05 +0000 (16:31 +0000)]

am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev

* commit '2fb139e02c1e9d2d7c92acf813445a063e73d94f':
Fix CalendarView to show the right labels. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:02 +0000 (16:31 +0000)]

am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '888461c801b531f31b2ef34617d333d781d93010':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:20:13 +0000 (02:20 +0000)]

am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

* commit 'd915dcac365b6d3ad88afab52e74ccca7dfbefec':
Layoutlib tests now check methods return value [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:20:10 +0000 (02:20 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:20:07 +0000 (02:20 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:19:59 +0000 (02:19 +0000)]

am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]

* commit 'cda89ca02548c19250ae55671c055536b64b74f8':
Fix a bug in Nine Patch library. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:19:56 +0000 (02:19 +0000)]

am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]

* commit 'a2b34c96f1ef24d96854d1e23426dec7774510e8':
Optimize layout rendering in layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:19:52 +0000 (02:19 +0000)]

am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

* commit 'e183855c1eb7baf750c67bb20e70fb887eba7af6':
Add methods for Time_Delegate [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:19:49 +0000 (02:19 +0000)]

am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit 'e5a2347bc6cf1506799136af4c9724275ca0247e':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:19:46 +0000 (02:19 +0000)]

am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit '30505abeb6cda9d042ec41f2563d561714eac46b':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:16:26 +0000 (19:16 -0700)]

resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

Change-Id: I16a4ce0863576cca07b1753f0ad56d6e97015c78

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:12:15 +0000 (02:12 +0000)]

am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '5e8b02dbafc3e097a43230f881bd289e207f7bfe':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:12:12 +0000 (02:12 +0000)]

am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '9887703df219e9f2dac4714fbdb4dc34ac56d2c4':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:07:28 +0000 (02:07 +0000)]

am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '42556c394b1f7bf53f59aa6905dc0d20fe495389':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:07:25 +0000 (02:07 +0000)]

am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '202800b12d7bbfd719da1c5fa50f646188312e97':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:02:56 +0000 (02:02 +0000)]

am f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]

* commit 'f20c9c660edcce0fe90ba5f8464f726dcd51229e':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:02:54 +0000 (02:02 +0000)]

am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '3990ec3490cc43a2690163f2a973b5ac6c4bdc46':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:02:50 +0000 (02:02 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:01:41 +0000 (19:01 -0700)]

resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev

Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:57:34 +0000 (18:57 -0700)]

resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp

Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:57:25 +0000 (01:57 +0000)]

am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]

* commit '06c4f23d737082717f37f5f3583d9c12f4b64bf2':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:57:22 +0000 (01:57 +0000)]

am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit 'cdb87d8d83e8a76a4cf78d24d5c49ee8548eba1f':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:57:18 +0000 (01:57 +0000)]

am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit 'edae4e69512a7c9df1076fde70de83e15053a30a':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:52:32 +0000 (01:52 +0000)]

am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

* commit '4b5da86d04200ba278b62ff99da91e212b87e9af':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:52:28 +0000 (01:52 +0000)]

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]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:52:25 +0000 (01:52 +0000)]

am 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE]

* commit '2d82586b96593b1b3b5280d77d5ae9a09df9d1fd':
Fix CalendarView to show the right labels. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:52:21 +0000 (01:52 +0000)]

am 64dc0380: Fix layoutlib [DO NOT MERGE]

* commit '64dc0380127047ffcf135b6848c9150aa8dbed85':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:52:18 +0000 (01:52 +0000)]

am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit 'a59c27dd6674a31c875b0baa86519caec628ca2d':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:52:15 +0000 (01:52 +0000)]

am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '8a39c3afb29f2540b05319042e758dd4d5f73a1e':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:50:00 +0000 (01:50 +0000)]

am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit '90ce58ecfdf7231611d70c849f14e5e71d1c8220':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:57 +0000 (01:49 +0000)]

am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit '099f40a950a14b66005b17657d967ef080569a15':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:55 +0000 (01:49 +0000)]

am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit '60b52ee929c8765c2d99f1b1e35d326e03895ba0':
Fix class name for OverflowMenuButton [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:52 +0000 (01:49 +0000)]

am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]

* commit '7c6f6481f46b8244406790604c5f8b3f712c369f':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:50 +0000 (01:49 +0000)]

am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]

* commit '22de7c4c3d44e51aef6937e1b39540703ad01f5c':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:42 +0000 (01:49 +0000)]

am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]

* commit '094fd8ecb6f4b666be6c9e7332679bce28fdc3ca':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:39 +0000 (01:49 +0000)]

am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

* commit '56759be8960ea1b5dc8b6de1810a84e2f10e2058':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:37 +0000 (01:49 +0000)]

am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]

* commit 'fe38489f6734fefd0a216e9cfe12f8f978ff371f':
Action bar rendering in layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:34 +0000 (01:49 +0000)]

am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]

* commit 'cc5340bc6301f8d9bf2cdb6ad2036964a3d179f5':
Add missing dependency in layoutlib build file [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:31 +0000 (01:49 +0000)]

am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

* commit '76dccb7f436565136ff5e15b1ca57530940f5642':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:28 +0000 (01:49 +0000)]

am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

* commit '1ed75bde09275c9f2bd1f81830e381ea864ac7f5':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:25 +0000 (01:49 +0000)]

am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

* commit '6136af326e64037184a7a2a3ae60c399f04d631f':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:21 +0000 (01:49 +0000)]

am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]

* commit '2bd65db15fa6a265ccc4023161611088bc791b4e':
Layoutlib tests now check methods return value [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 16 Apr 2014 02:30:35 +0000 (19:30 -0700)]

Layoutlib tests now check methods return value [DO NOT MERGE]

The change is a cherry-pick from klp-dev.

The change also fixes the errors found by fixing the tests.

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
(cherry-picked from commit 2bd65db15fa6a265ccc4023161611088bc791b4e)

commit | commitdiff | tree

Deepanshu Gupta [Wed, 19 Feb 2014 19:05:02 +0000 (11:05 -0800)]

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)

commit | commitdiff | tree

Deepanshu Gupta [Wed, 19 Feb 2014 18:53:27 +0000 (10:53 -0800)]

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)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 6 Feb 2014 01:11:14 +0000 (17:11 -0800)]

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)

commit | commitdiff | tree

Deepanshu Gupta [Tue, 21 Jan 2014 01:02:37 +0000 (17:02 -0800)]

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)

commit | commitdiff | tree

Deepanshu Gupta [Sat, 1 Feb 2014 03:03:48 +0000 (19:03 -0800)]

Add methods for Time_Delegate [DO NOT MERGE]

Bug: http://b.android.com/65359
Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
(cherry-picked from 02cde9ceeb4c052ee273a5d809816dfd355ebb56)

commit | commitdiff | tree

Deepanshu Gupta [Tue, 12 Nov 2013 13:03:17 +0000 (18:33 +0530)]

Fix NPE in layoutlib. [DO NOT MERGE]

Change-Id: I36623304d83b344ea078044001577b8005a63c02
(cherry picked from commit 689c0dfe72a57c0555560012cbc6806375e7d4b7)

commit | commitdiff | tree

Deepanshu Gupta [Fri, 8 Nov 2013 11:13:07 +0000 (16:43 +0530)]

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)

commit | commitdiff | tree

Deepanshu Gupta [Tue, 10 Sep 2013 22:41:21 +0000 (15:41 -0700)]

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)

commit | commitdiff | tree

Deepanshu Gupta [Sun, 13 Oct 2013 01:37:19 +0000 (18:37 -0700)]

Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

Issue: https://code.google.com/p/android/issues/detail?id=59732

Change-Id: I281b3fdad88c591281a3645592c84f3e2cb61d09
(cherry picked from commit 6335590aa8997944cc7fb358a315dbb9b789f87f)

commit | commitdiff | tree

Deepanshu Gupta [Sun, 13 Oct 2013 04:28:50 +0000 (21:28 -0700)]

Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

Issue: https://code.google.com/p/android/issues/detail?id=60993

Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25
(cherry picked from commit 11ee746dc5e77f4f33aac45ac9e344444223012d)

commit | commitdiff | tree

Deepanshu Gupta [Tue, 15 Oct 2013 01:14:58 +0000 (18:14 -0700)]

Fix CalendarView to show the right labels. [DO NOT MERGE]

Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
(cherry picked from commit 44bcd64e5b9fd211dd56b0598693a0559f65dc1a)

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help