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

92715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
d5de1bd630 am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit '30505abeb6cda9d042ec41f2563d561714eac46b':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-13 02:19:46 +00:00
Deepanshu Gupta
a7c0d02ad6 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]
 2014-05-13 02:16:50 +00:00
Deepanshu Gupta
51ce58a7bb 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]
 2014-05-13 02:16:48 +00:00
Deepanshu Gupta
888461c801 resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev 
Change-Id: I16a4ce0863576cca07b1753f0ad56d6e97015c78
 2014-05-12 19:16:26 -07:00
Deepanshu Gupta
0e50f1c2ca 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]
 2014-05-13 02:12:15 +00:00
Deepanshu Gupta
37f43311e1 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]
 2014-05-13 02:12:12 +00:00
Deepanshu Gupta
5e8b02dbaf 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]
 2014-05-13 02:07:28 +00:00
Deepanshu Gupta
9887703df2 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]
 2014-05-13 02:07:25 +00:00
Deepanshu Gupta
1103ece28c am f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit 'f20c9c660edcce0fe90ba5f8464f726dcd51229e':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 02:02:56 +00:00
Deepanshu Gupta
42556c394b am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit '3990ec3490cc43a2690163f2a973b5ac6c4bdc46':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:02:54 +00:00
Deepanshu Gupta
202800b12d 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]
 2014-05-13 02:02:50 +00:00
Deepanshu Gupta
2fb139e02c resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev 
Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c
 2014-05-12 19:01:41 -07:00
Deepanshu Gupta
8a70bcef5a resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp 
Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8
 2014-05-12 18:57:34 -07:00
Deepanshu Gupta
f20c9c660e am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit '06c4f23d737082717f37f5f3583d9c12f4b64bf2':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 01:57:25 +00:00
Deepanshu Gupta
3990ec3490 am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'cdb87d8d83e8a76a4cf78d24d5c49ee8548eba1f':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 01:57:22 +00:00
Deepanshu Gupta
4d69ca223b am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit 'edae4e69512a7c9df1076fde70de83e15053a30a':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 01:57:18 +00:00
Deepanshu Gupta
1ba310ca02 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]
 2014-05-13 01:55:09 +00:00
Deepanshu Gupta
995c4d5153 am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit 'b7bafba7c602150da9c0f06335e3c853e919501c':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 01:55:07 +00:00
Deepanshu Gupta
59a0f746eb am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit '51dd8878cb401128d730aecf9fe18c1e06221ac4':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-05-13 01:55:04 +00:00
Deepanshu Gupta
a51ac1bd06 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]
 2014-05-13 01:55:02 +00:00
Deepanshu Gupta
09a42524dd am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
* commit '30db282f2a3692f8c98cb3bdbb0534ad348d1bd7':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 01:54:59 +00:00
Deepanshu Gupta
80f2914b4b 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]
 2014-05-13 01:54:56 +00:00
Deepanshu Gupta
e686fbced9 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]
 2014-05-13 01:54:53 +00:00
Deepanshu Gupta
21404483ad am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '0bb06b91e7be5b7f8c397295094aeaf1df8dbb09':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 01:54:50 +00:00