OSDN Git Service

android-x86/frameworks-base.git
10 years agoam bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix...
Deepanshu Gupta [Tue, 13 May 2014 18:11:23 +0000 (18:11 +0000)]
am bb7cfa1e: 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 'bb7cfa1e1984342d896e664d0c8e2ed654e838cc':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

10 years agoam e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix...
Deepanshu Gupta [Tue, 13 May 2014 18:11:20 +0000 (18:11 +0000)]
am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]

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

10 years agoam 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 18:11:17 +0000 (18:11 +0000)]
am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

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

10 years agoam 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin...
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]

10 years agoam 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine...
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]

10 years agoam 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
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]

10 years agoam fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add...
Deepanshu Gupta [Tue, 13 May 2014 18:03:44 +0000 (18:03 +0000)]
am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

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

10 years agoam 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix...
Deepanshu Gupta [Tue, 13 May 2014 18:03:41 +0000 (18:03 +0000)]
am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

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

10 years agoam cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix...
Deepanshu Gupta [Tue, 13 May 2014 18:03:38 +0000 (18:03 +0000)]
am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

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

10 years agoam 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 18:03:36 +0000 (18:03 +0000)]
am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

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

10 years agoam c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans...
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]

10 years agoam 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library...
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]

10 years agoam c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for...
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]

10 years agoam 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib...
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]

10 years agoam d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in...
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]

10 years agoam 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev
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]

10 years agoresolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
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

10 years agoam 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate...
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]

10 years agoam 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT...
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]

10 years agoam df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action...
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]

10 years agoresolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 17:51:28 +0000 (10:51 -0700)]
resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

10 years agoam f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 17:49:56 +0000 (17:49 +0000)]
am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

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

10 years agoam dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev
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]

10 years agoresolved conflicts for merge of 520f585b to jb-mr1.1-dev
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

10 years agoam f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutl...
Deepanshu Gupta [Tue, 13 May 2014 17:18:58 +0000 (17:18 +0000)]
am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

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

10 years agoam 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 17:18:55 +0000 (17:18 +0000)]
am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

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

10 years agoam 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update...
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]

10 years agoam a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
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]

10 years agoam 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon...
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]

10 years agoresolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
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

10 years agoam 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts...
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]

10 years agoam 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
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]

10 years agoam 8c5c2410: am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO...
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]

10 years agoam 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 16:36:38 +0000 (16:36 +0000)]
am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '07f8da65e231142e6915d9aa7853dd4d772112a0':
  Fix layoutlib [DO NOT MERGE]

10 years agoam 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]
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]

10 years agoam 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
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]

10 years agoam d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT...
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]

10 years agoam ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp
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]

10 years agoam 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutli...
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]

10 years agoam 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status...
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]

10 years agoam 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib...
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]

10 years agoam d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
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]

10 years agoam 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
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]

10 years agoam 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]
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]

10 years agoam 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
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]

10 years agoam d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
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]

10 years agoam 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp
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]

10 years agoam 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT...
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]

10 years agoam 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO...
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]

10 years agoam 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev
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]

10 years agoam 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
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]

10 years agoam 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT...
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]

10 years agoam cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
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]

10 years agoam a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
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]

10 years agoam e183855c: Add methods for Time_Delegate [DO NOT MERGE]
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]

10 years agoam e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
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]

10 years agoam 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
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]

10 years agoam 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix...
Deepanshu Gupta [Tue, 13 May 2014 02:16:50 +0000 (02:16 +0000)]
am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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

10 years agoam 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add...
Deepanshu Gupta [Tue, 13 May 2014 02:16:48 +0000 (02:16 +0000)]
am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

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

10 years agoresolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
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

10 years agoam 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastExcepti...
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]

10 years agoam 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation...
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]

10 years agoam 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rende...
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]

10 years agoam 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration...
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]

10 years agoam f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]
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]

10 years agoam 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView...
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]

10 years agoam 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib...
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]

10 years agoresolved conflicts for merge of 9f2f5e77 to jb-mr1-dev
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

10 years agoresolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp
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

10 years agoam 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]
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]

10 years agoam cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT...
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]

10 years agoam edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT...
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]

10 years agoam efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT...
Deepanshu Gupta [Tue, 13 May 2014 01:55:09 +0000 (01:55 +0000)]
am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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

10 years agoam b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT...
Deepanshu Gupta [Tue, 13 May 2014 01:55:07 +0000 (01:55 +0000)]
am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]

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

10 years agoam 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:55:04 +0000 (01:55 +0000)]
am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit '51dd8878cb401128d730aecf9fe18c1e06221ac4':
  Fix class name for OverflowMenuButton [DO NOT MERGE]

10 years agoam 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT...
Deepanshu Gupta [Tue, 13 May 2014 01:55:02 +0000 (01:55 +0000)]
am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]

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

10 years agoam 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:54:59 +0000 (01:54 +0000)]
am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]

* commit '30db282f2a3692f8c98cb3bdbb0534ad348d1bd7':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]

10 years agoam b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:54:56 +0000 (01:54 +0000)]
am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]

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

10 years agoam 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT...
Deepanshu Gupta [Tue, 13 May 2014 01:54:53 +0000 (01:54 +0000)]
am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

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

10 years agoam 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:54:50 +0000 (01:54 +0000)]
am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]

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

10 years agoam f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT...
Deepanshu Gupta [Tue, 13 May 2014 01:54:48 +0000 (01:54 +0000)]
am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]

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

10 years agoam 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:54:44 +0000 (01:54 +0000)]
am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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

10 years agoam de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:54:42 +0000 (01:54 +0000)]
am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

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

10 years agoam 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:54:39 +0000 (01:54 +0000)]
am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

* commit '2f94c1db0d2c7e68891c3d96732fe39b199fac5d':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

10 years agoam ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT...
Deepanshu Gupta [Tue, 13 May 2014 01:54:36 +0000 (01:54 +0000)]
am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]

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

10 years agoam 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
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]

10 years agoam 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
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]

10 years agoam 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE]
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]

10 years agoam 64dc0380: Fix layoutlib [DO NOT MERGE]
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]

10 years agoam a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
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]

10 years agoam 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
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]

10 years agoam 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
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]

10 years agoam 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]
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]

10 years agoam 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]
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]

10 years agoam 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]
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]

10 years agoam 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]
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]

10 years agoam 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]
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]

10 years agoam 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
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]

10 years agoam fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
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]

10 years agoam cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]
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]