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

104915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
1eadb79e47 am fd8af673: (-s ours) am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit 'fd8af673020786080a9aeddf39383233f5f0d8f0':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:14:11 +00:00
Deepanshu Gupta
910c7153fc am be0c94ea: (-s ours) am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'be0c94ea6b6867948a074476cf39a1c4b04c55ff':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:14:09 +00:00
Deepanshu Gupta
48e3d0fac8 am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit 'dbfd29d85503b4a9e4a75ae74186623705749bac':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:14:06 +00:00
Deepanshu Gupta
fd8af67302 am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '9e614b25db75950d6b08f937f15c0bc0df74803f':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 18:09:06 +00:00
Deepanshu Gupta
be0c94ea6b am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'be2184e425bae9212d81fd90e4d7cc4f67ca9d0e':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 18:09:02 +00:00
Deepanshu Gupta
dbfd29d855 am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 
* commit '81ff5ba73f5c5c098cf4d2f46f360852bccf63da':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 18:08:59 +00:00
Deepanshu Gupta
9e614b25db 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]
 2014-05-13 18:03:41 +00:00
Deepanshu Gupta
be2184e425 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]
 2014-05-13 18:03:38 +00:00
Deepanshu Gupta
81ff5ba73f 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]
 2014-05-13 18:03:36 +00:00
Deepanshu Gupta
a1191b467d am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit '74503f66e0cb5a4ea617c4a66882e8c33e5cc888':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:01:00 +00:00
Deepanshu Gupta
204316c5ac 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]
 2014-05-13 17:57:56 +00:00
Deepanshu Gupta
cfc9e4ed5d 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]
 2014-05-13 17:57:52 +00:00
Deepanshu Gupta
72e3fc1d37 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]
 2014-05-13 17:57:41 +00:00
Deepanshu Gupta
74503f66e0 am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit '0c98ce5a08e7ee5343f58fe9afe56c8a9b9fb75e':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 17:56:55 +00:00
Deepanshu Gupta
8cf3343dc3 am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit '838e54826bbb03cec41684340c63be993d2dc160':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-13 17:54:26 +00:00
Deepanshu Gupta
d62dcc2958 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]
 2014-05-13 17:54:23 +00:00
Deepanshu Gupta
6f58831c64 resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev 2014-05-13 10:51:28 -07:00
Deepanshu Gupta
0c98ce5a08 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]
 2014-05-13 17:49:56 +00:00
Deepanshu Gupta
f75f33d33b 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]
 2014-05-13 17:44:40 +00:00
Deepanshu Gupta
ebcbb28319 am 0b2f4a18: (-s ours) am 20bec39e: 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 '0b2f4a18cc1c38d04d2efc7b47762a312d99c987':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 17:29:22 +00:00
Deepanshu Gupta
9ddb073bf7 am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit 'c70ce72a986f029c9f8c43b4060001624176068d':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:29:13 +00:00
Deepanshu Gupta
0b2f4a18cc am 20bec39e: 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 '20bec39e3f72d198f06b6b0d4a7ac40f52dc2c0e':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 17:24:13 +00:00
Deepanshu Gupta
c70ce72a98 am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit 'af9fde9680922f072981a4853e37ccfcf974920a':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:24:10 +00:00
Deepanshu Gupta
dd8ebf1e15 resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
Change-Id: I3982d8cd6585e6d4a3a9cf5b1d78f01f0e4ced6b
 2014-05-13 10:23:22 -07:00
Deepanshu Gupta
20bec39e3f 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]
 2014-05-13 17:18:58 +00:00
Deepanshu Gupta
af9fde9680 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]
 2014-05-13 17:18:55 +00:00
Deepanshu Gupta
f1517cc999 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]
 2014-05-13 17:14:10 +00:00
Deepanshu Gupta
425addb944 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]
 2014-05-13 17:14:07 +00:00
Deepanshu Gupta
69bae78787 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]
 2014-05-13 17:12:27 +00:00
Deepanshu Gupta
a43aaf00b5 resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b
 2014-05-13 09:49:18 -07:00
Deepanshu Gupta
5974d229f9 am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit '0cbfde12fde85713f87d8c5ac0cc137c143dfd27':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 16:46:48 +00:00
Deepanshu Gupta
0cbfde12fd am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit '40b54563743c3bab92ee7086f8a2b159ecef5453':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 16:41:50 +00:00
Deepanshu Gupta
40b5456374 am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit '07f8da65e231142e6915d9aa7853dd4d772112a0':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 16:36:38 +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
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
07f8da65e2 am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit '888461c801b531f31b2ef34617d333d781d93010':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 16:31:02 +00:00
Deepanshu Gupta
5b42e1ae55 am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'b5b4d6eb790ec344680f92f75edd75c427058266':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:27:24 +00:00
Deepanshu Gupta
cb2400661a am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '977ede48a26e9c1a9f5f840448edadd89255b161':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 02:27:21 +00:00
Deepanshu Gupta
b5b4d6eb79 am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'a7c0d02ad6b161b5084abc8a2740f7e783d4ad1e':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:21:57 +00:00
Deepanshu Gupta
977ede48a2 am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '51ce58a7bb2798c2aac1f5a1d76deaeab27e21da':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 02:21:54 +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