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

117244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
db83a08b13 am 86726f58: am eb5b38b1: (-s ours) am a350f96e: am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit '86726f58dba0f2ee6d7e62255dbf7356a7201897':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:28:12 +00:00
Deepanshu Gupta
84cea70792 am 0573cffa: am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '0573cffacc4a7247151aae62d176a9e947e1dabe':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:28:10 +00:00
Deepanshu Gupta
86726f58db am eb5b38b1: (-s ours) am a350f96e: am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'eb5b38b167dd5f094acc085ede494966ed0024c5':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:23:37 +00:00
Deepanshu Gupta
0573cffacc am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit 'b520cc45996de4a172147d4e934768ec6c417666':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:23:35 +00:00
Deepanshu Gupta
eb5b38b167 am a350f96e: am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'a350f96ec97ce5ea6c61683f85f4e39fe45fa42b':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:17:54 +00:00
Deepanshu Gupta
b520cc4599 am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit 'cf2af66180e7debda36a1cece4732d0403ce37b7':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:17:51 +00:00
Deepanshu Gupta
883a17cd95 am 14480abe: am bfc75f68: am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '14480abeb6642d7b779d50f03e5340356a4e4b2b':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:14:56 +00:00
Deepanshu Gupta
a350f96ec9 am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit '0eb268a0de02b73dd23ab2e672c35a2650a9eea4':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:12:32 +00:00
Deepanshu Gupta
cf2af66180 am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '752b90f2605956e0de880c2a406dc887aeb3d8c2':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:12:29 +00:00
Deepanshu Gupta
14480abeb6 am bfc75f68: am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit 'bfc75f6895171aeac68f2506fd318a3eb5d4b9e4':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:09:22 +00:00
Deepanshu Gupta
0eb268a0de am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit '22dabb52820d81744f46d009a27bf9294928bbee':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:07:31 +00:00
Deepanshu Gupta
752b90f260 am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '919ce2051595dfa5dd047660946038d23fa688f4':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:07:28 +00:00
Deepanshu Gupta
a22e96bfec am 4e1023a1: am 89279ad1: (-s ours) am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '4e1023a1fccc06f382a976a94bcb29c3764183f5':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 21:07:01 +00:00
Deepanshu Gupta
7b22846433 am ce33060c: am 563d0ee7: am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit 'ce33060c92a8e0d739f020b6227f2ee6007724fe':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 21:06:58 +00:00
Deepanshu Gupta
bfc75f6895 am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '11243dd66484d0f99f56454491d5d82acfca6070':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:04:28 +00:00
Deepanshu Gupta
4e1023a1fc am 89279ad1: (-s ours) am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '89279ad140a30e5d134d6d948c4c6d835b5ca5b3':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 21:02:23 +00:00
Deepanshu Gupta
ce33060c92 am 563d0ee7: am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '563d0ee7d48df767c2d4da127f1224140fa65cfd':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 21:02:19 +00:00
Deepanshu Gupta
22dabb5282 am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'c261cb0dcd2ea4ca35dbef1973c0a08709ce5ae1':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:02:11 +00:00
Deepanshu Gupta
919ce20515 am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '03bf747fec291b355af531bf0b04a2b1669bf92e':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:02:08 +00:00
Deepanshu Gupta
9d0fcb73e2 am 9cc952e7: am b7b64cc4: am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '9cc952e74a8f82b85a9bd8cbd7cbfb286c9b65d6':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 21:02:06 +00:00
Deepanshu Gupta
11243dd664 am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '9f5f450dca41bcea94b2abae1c782a84c0387f6d':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:59:25 +00:00
Deepanshu Gupta
89279ad140 am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '9d3ec0be302acf9f29d0fb2be644841d71ed5e63':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:58:36 +00:00
Deepanshu Gupta
563d0ee7d4 am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '04f0cb6e958cc1529e3be04ef454a35f416d9667':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:58:33 +00:00
Deepanshu Gupta
9cc952e74a am b7b64cc4: am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'b7b64cc4884e933d0da4664ce7195caa5003ef65':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:57:20 +00:00
Deepanshu Gupta
c261cb0dcd am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'f354d01afde602034e3d531eb7cbfe5fa5c48a21':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 20:56:33 +00:00
Deepanshu Gupta
03bf747fec am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '858ab06a38769aaa05a4b87a600739c9294b382d':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 20:56:31 +00:00
Deepanshu Gupta
9f5f450dca am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit 'e5c518cbd0544a44bae8cb2a0b90d18bb91c5b8a':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:54:20 +00:00
Deepanshu Gupta
9d3ec0be30 am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '48931fcc0d7f6d82011414ffc234a52a1cce11a4':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:53:35 +00:00
Deepanshu Gupta
04f0cb6e95 am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '34aa1bd392ab71b22e8b2bc2a0fe29be88428762':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:53:32 +00:00
Deepanshu Gupta
b7b64cc488 am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'e0105901ea442e2f760f4fb657afc5db2d65e02a':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:51:32 +00:00
Deepanshu Gupta
f354d01afd am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'aab60856f9df28da8246568621b59ed57bdc424b':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 20:51:14 +00:00
Deepanshu Gupta
858ab06a38 am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit 'ec1b4df6d2ccfe35c251344b43a29af65c3b56e1':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 20:51:11 +00:00
Deepanshu Gupta
48931fcc0d am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'a312214f736638486983874b4f266bb537bab723':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:49:25 +00:00
Deepanshu Gupta
34aa1bd392 am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '54b946fe3c0f86f4cba3bc5bc07d920b654a0ef0':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:49:22 +00:00
Deepanshu Gupta
e5c518cbd0 am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '4e8b055b2ad23f6e336872f775058bcf18c46dfd':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:49:06 +00:00
Deepanshu Gupta
aab60856f9 am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'ebd909cca1f69028878f15e6fb0ece6e8c8da584':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 20:48:06 +00:00
Deepanshu Gupta
e0105901ea am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '52b49665f526c7b4de977f3c424dc85d1b9a5d1f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:46:41 +00:00
Deepanshu Gupta
4e8b055b2a am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '6dad59e146dc16a2386124a5cd3b28411c024c4f':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:43:51 +00:00
Deepanshu Gupta
a312214f73 am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '9358cf04dc0db493a8702a4a8051f9839e9de6d7':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:43:18 +00:00
Deepanshu Gupta
54b946fe3c am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit 'f46900c5eaeff0fbba7f20466be87db67002d6bf':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:43:16 +00:00
Deepanshu Gupta
52b49665f5 am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'eff94bc3647c23c223abe4946595d51d80985eec':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:41:24 +00:00
Deepanshu Gupta
ec1b4df6d2 resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 2014-05-13 13:40:14 -07:00
Deepanshu Gupta
9358cf04dc am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'ccf6b34799efb14e5883ed4901ff03bf75ac4c1c':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:38:17 +00:00
Deepanshu Gupta
f46900c5ea am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '87a54055e61918986021eb5e1e3dbefe40839367':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:38:15 +00:00
Deepanshu Gupta
6dad59e146 am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '85b751949b3d383494523bb98b016157d76787f3':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:38:12 +00:00
Deepanshu Gupta
eff94bc364 am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '8c19c6a17d8a019086a36988937462acfb6b830f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:36:24 +00:00
Deepanshu Gupta
ccf6b34799 am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'a154687620a6d53f17c7abc36d419884cd6df2b7':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:33:33 +00:00
Deepanshu Gupta
87a54055e6 am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '5878115a6e19041439b335efae066862e21775a1':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:33:30 +00:00
Deepanshu Gupta
85b751949b resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 2014-05-13 13:32:59 -07:00
Deepanshu Gupta
a154687620 am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '7ef276450f3157cc68f714b0d5805319e6f4c555':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:31:33 +00:00