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

131657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
ce68e782e8 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]
 2014-05-13 18:11:20 +00:00
Deepanshu Gupta
c5c49dcd5c 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]
 2014-05-13 18:11:17 +00:00
Deepanshu Gupta
a7ed116d0f am 5dce0a4b: am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit '5dce0a4b3d933e5d7174ba487fd180b6165d2923':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:11:14 +00:00
Deepanshu Gupta
81ac665ca5 am 060836bd: am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '060836bdf742cc790014cf0f2eaa80b4ace92841':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-13 18:09:09 +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
5dce0a4b3d am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev 
* commit 'a1191b467d9687cd34e0cec2d4ac827f6020c160':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-13 18:05:51 +00:00
Deepanshu Gupta
776c192379 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]
 2014-05-13 18:05:48 +00:00
Deepanshu Gupta
26dd61c55a 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]
 2014-05-13 18:05:46 +00:00
Deepanshu Gupta
bb7cfa1e19 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]
 2014-05-13 18:05:44 +00:00
Deepanshu Gupta
e535ff2872 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]
 2014-05-13 18:05:41 +00:00
Deepanshu Gupta
8b78a1d7e3 am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
* commit '9f00e655db5b2b7c3527c20b60dc816eee6eff1d':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-13 18:05:39 +00:00
Jeff Davidson
6006c1a546 Mark network score permission strings as untranslatable. 
Bug: 14615157
Change-Id: Id11d24d502ab70e6590cf5ec22faa6352c012af7
 2014-05-13 11:04:36 -07:00
Deepanshu Gupta
f8c568586d resolved conflicts for merge of 727ad350 to jb-mr1.1-dev 2014-05-13 11:04:29 -07:00
Deepanshu Gupta
060836bdf7 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]
 2014-05-13 18:03:44 +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
3c9fceaeb4 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]
 2014-05-13 18:02:38 +00:00
Deepanshu Gupta
07009057fe 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]
 2014-05-13 18:02:35 +00:00
Deepanshu Gupta
85c5cdcd58 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]
 2014-05-13 18:02:32 +00:00
Deepanshu Gupta
488f624798 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]
 2014-05-13 18:02:29 +00:00
Deepanshu Gupta
024c45876c am d290aa3d: am e36126e0: 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 'd290aa3d682f548df61bd5933de85f78e6e09657':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 18:01:07 +00:00
Deepanshu Gupta
567f948b60 am 872a5a1a: am 01fefec9: 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 '872a5a1a93eef53a18d18778104bb8669b4bc073':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 18:01:02 +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
70efbad064 am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit 'bd5a3e6510e83b161a0e40c191d349524ae4a8e6':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 17:58:17 +00:00
Deepanshu Gupta
8bf73eae6c am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '0ad4f2cedde037c2b09a7f09c5f95f0984267c64':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 17:58:14 +00:00
Deepanshu Gupta
fed25eb8b3 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]
 2014-05-13 17:57:58 +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
Adam Lesinski
3921e87e6e Quick fix to ensure mipmap doesn't get stripped by AAPT 
This is a quick fix. A refactoring is already underway to properly
solve this problem.

Bug:14857725
Change-Id: Ic0c475aa0b180803a687904ad9f71eb87e137a25
 2014-05-13 10:57:53 -07: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
9f00e655db resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev 
Change-Id: I6d3a92e8d3853069c1d8cb3399d6dfcb5b58da83
 2014-05-13 10:55:56 -07:00
Deepanshu Gupta
d290aa3d68 am e36126e0: 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 'e36126e0bc92ee23f9dd05ab2e4287753a062903':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-13 17:55:46 +00:00
Deepanshu Gupta
872a5a1a93 am 01fefec9: 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 '01fefec9397569cf9c7c5b599c16126f1b4d6870':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
 2014-05-13 17:55:41 +00:00
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
bd5a3e6510 am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit '1677a9bdeba3961625236925e754920fca1b7e89':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 17:53:55 +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
Deepanshu Gupta
0ad4f2cedd resolved conflicts for merge of 7377c7be to jb-mr1-dev 
Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
 2014-05-13 10:44:24 -07:00