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

131376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
c233bb65bc 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]
 2014-05-13 17:54:29 +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
e36126e0bc am 862e64ad: am bacf26f4: (-s ours) am 8b53c5b1: am ebcbb283: 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 '862e64addc2c56a27fa39611a6d559caae6cd9dd':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 17:50:55 +00:00
Deepanshu Gupta
01fefec939 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 '5fc8f945ee6a763b08e47019319432ec71ba1d1a':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:50:45 +00: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
862e64addc am bacf26f4: (-s ours) am 8b53c5b1: am ebcbb283: 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 'bacf26f44141ae8f861f96e3eb09da8b9e9a657a':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 17:45:51 +00:00
Deepanshu Gupta
5fc8f945ee 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 'b0f2ded5e9e84fb51ec5b2cb6b419b040b008276':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:45:43 +00:00
Ricardo Cervera
3144fde70f am 4472b649: am 7ce3b5ef: am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs 
* commit '4472b649f975f2ddf6450bfdfd8fd1eae7a92e46':
  docs: Added release notes for Build Tools 19.1.0
 2014-05-13 17:45:22 +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
Ricardo Cervera
4472b649f9 am 7ce3b5ef: am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs 
* commit '7ce3b5ef64b1a183b75279016e6fc4f65be8c933':
  docs: Added release notes for Build Tools 19.1.0
 2014-05-13 17:40:01 +00:00
Deepanshu Gupta
bacf26f441 am 8b53c5b1: am ebcbb283: 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 '8b53c5b16b612c35b3d3512e9dc726eceebab308':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 17:39:17 +00:00
Deepanshu Gupta
b0f2ded5e9 am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '40db4a13bc8389dd94cac2fd4c896e10b46c2499':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:39:14 +00:00
Deepanshu Gupta
8b53c5b16b am ebcbb283: 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 'ebcbb28319bea2674455c978cc8fb85b252863b3':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 17:35:04 +00:00
Deepanshu Gupta
40db4a13bc am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev 
* commit '9ddb073bf72d9ca587ecc626dcc9721dd33447c9':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:35:00 +00:00
Ricardo Cervera
7ce3b5ef64 am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs 
* commit '04c9d1932d8a4c0f646a51ce6674535bd77b6172':
  docs: Added release notes for Build Tools 19.1.0
 2014-05-13 17:34:49 +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
Ricardo Cervera
04c9d1932d am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs 
* commit '9d7cf8256105ea2171999cbcc8a613a58a25f953':
  docs: Added release notes for Build Tools 19.1.0
 2014-05-13 17:29:20 +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
fd81af3e65 am 1073d2ae: am 6c81d1e7: am 987953a2: am 3271adea: am 6b0c4276: am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit '1073d2aebaa2486460ba0f043502472baa48e398':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 17:25:53 +00:00
Ricardo Cervera
9d7cf82561 Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs 2014-05-13 17:24:49 +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
Ricardo Cervera
a7a55c1ef4 docs: Added release notes for Build Tools 19.1.0 
Change-Id: Icd162f7b1b7634b7b503d6d39a17fcb1c43a74c9
 2014-05-13 10:21:35 -07:00
Deepanshu Gupta
1073d2aeba am 6c81d1e7: am 987953a2: am 3271adea: am 6b0c4276: am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit '6c81d1e7f0929ccee18b75bcdcedc19c5eb3798c':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 17:19:30 +00: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
Nicolas Prevot
2022597859 Merge "Resolving resources across users." 2014-05-13 17:17:18 +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
6c81d1e7f0 am 987953a2: am 3271adea: am 6b0c4276: am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit '987953a2dd8752cbf14741f022b64a3b7ce59f60':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 17:11:38 +00:00
Deepanshu Gupta
987953a2dd am 3271adea: am 6b0c4276: am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit '3271adea10a7a35d4fe852801794038f01e371be':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 17:07:41 +00:00
Deepanshu Gupta
3271adea10 am 6b0c4276: am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit '6b0c427670606abf5539789299042dc04c67703e':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 17:02:20 +00:00
Deepanshu Gupta
6b0c427670 am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit 'dff29f73612799506739c8ef83e1313461f37a4b':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 16:57:08 +00:00
Deepanshu Gupta
dff29f7361 am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
* commit '5974d229f9af39df149c8b0c4081826f9a65ce8c':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 16:51:51 +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
0f26b51025 am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '9053261a5413f401168d25fa4a9749723b232949':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 16:36:56 +00:00
Deepanshu Gupta
727ad35081 am 5594616c: am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit '5594616c4f4513dc97b08d6cabb6fd7127dde131':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 16:36:53 +00:00
Deepanshu Gupta
627cab1257 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]
 2014-05-13 16:36:50 +00:00
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
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
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