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

150724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sandeep Siddhartha
3e3a7a4c08 am cffbcb8a: Merge "Address API review comments" into lmp-dev 
* commit 'cffbcb8aa117177b24c1395e728c0afc53d64882':
  Address API review comments
 2014-08-29 06:29:12 +00:00
Sandeep Siddhartha
503a102143 Merge "Address API review comments" into lmp-dev 2014-08-29 06:22:08 +00:00
Adam Lesinski
88fff68115 am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '995c771f7aef835972a5044f267a2d201449efab':
  Fix memory leak in ResTable
 2014-08-29 05:40:25 +00:00
Adam Lesinski
a9aa9f0458 Merge "Fix memory leak in ResTable" into lmp-dev 2014-08-29 05:27:49 +00:00
Terry Heo
8a67d3f8e3 am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev 
* commit 'd3f234629ac7d693ced141ade1941d726aa453cd':
  CEC: Implement dump() of HdmiControlService
 2014-08-29 05:22:21 +00:00
Terry Heo
97bf45464c Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev 2014-08-29 05:12:57 +00:00
Adam Powell
31ffb26a31 am ae806d87: Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev 
* commit 'ae806d87bd321826f1dec904e7aff6d02d501689':
  Doc improvements for new Toolbar changes, now with attributes.
 2014-08-29 03:37:49 +00:00
Adam Powell
b1b5ee6029 am cbed634a: Merge "Don\'t add title margins during to Toolbar layout if titles don\'t fit" into lmp-dev 
* commit 'cbed634abd495e6f14b45c6fcfa3b63f2e68e6be':
  Don't add title margins during to Toolbar layout if titles don't fit
 2014-08-29 03:37:42 +00:00
Adam Powell
258f50064c am 31192ba8: Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev 
* commit '31192ba8a6bdce3e686ecaddfb8d393fea39d884':
  Add xml attributes to Toolbar for navigation icon
 2014-08-29 03:37:35 +00:00
Adam Lesinski
9e05bd189b am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit 'e0cfbb61df1b622763ec7cf8d54e0e7cf89599d8':
  Stamp platform version code into app Apks
 2014-08-29 03:35:47 +00:00
Jeff Tinker
1d015f57a3 am b8ccb705: Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 
* commit 'b8ccb705fe5f11e4a1aa88cb02f2e5f9b7d5108d':
  Fix exception message string formatting in MediaDrm
 2014-08-29 03:35:42 +00:00
Svetoslav
2d3cac2128 am 6a353ad0: Merge "Print UI polish." into lmp-dev 
* commit '6a353ad0caaaf634804c18467838a5804c2abe06':
  Print UI polish.
 2014-08-29 03:35:20 +00:00
Dongwon Kang
cfe06fa3df am 2e585e88: Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev 
* commit '2e585e886e33cebd8c06a5f8678758a19c3cd9ab':
  TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
 2014-08-29 03:03:08 +00:00
Dianne Hackborn
0e4a15dbfb am 1fee525a: Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 
* commit '1fee525a509a67adcf6b5a484f0072a72f340bad':
  Debug issue #17310019: pause when launching settings
 2014-08-29 03:03:03 +00:00
Svetoslav
fbf98e5f52 am 8308a3cb: Merge "Fix app widget serices not being unbound." into lmp-dev 
* commit '8308a3cb31c31b4587a91f02424ff0c1106bb1c0':
  Fix app widget serices not being unbound.
 2014-08-29 03:02:58 +00:00
Alex Light
8fc4f51add am a2f18dc1: Remove obsolete pruneDexCache 
* commit 'a2f18dc1a8d1aac9cf0a8cecb92f76b43a3c4e7e':
  Remove obsolete pruneDexCache
 2014-08-29 03:02:53 +00:00
Alex Light
f8c3fb9daf am 19f3d22f: Change /dalvik-cache to be owned by root. 
* commit '19f3d22f09fbaa1500d953b6e23e182c41d4c9da':
  Change /dalvik-cache to be owned by root.
 2014-08-29 03:02:49 +00:00
Dongwon Kang
20c6367810 am 6b9575be: Merge "TIF: cosmetic changes for consistency." into lmp-dev 
* commit '6b9575be3c52493041d28a929e1bf04e96233bac':
  TIF: cosmetic changes for consistency.
 2014-08-29 03:02:44 +00:00
RoboErik
9a0757db73 am 85f23210: Fix test build 
* commit '85f232102ec2a0554f9b431da3784bd75f1919a1':
  Fix test build
 2014-08-29 03:02:38 +00:00
Jeff Sharkey
a82c1cf5f5 am f894a0d3: Merge "Teach API lint about package layering!" into lmp-dev 
* commit 'f894a0d39112077e8f1e2ca67fa4be96d5ca4c79':
  Teach API lint about package layering!
 2014-08-29 03:02:30 +00:00
Adam Powell
f825e0c561 Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev 2014-08-29 02:49:47 +00:00
Adam Powell
d760249623 Doc improvements for new Toolbar changes, now with attributes. 
Change-Id: I3f67899b4f9ab9ae4ab4f5dcbc853c08d7867947
 2014-08-28 19:35:36 -07:00
Adam Powell
b051ef62af Merge "Don't add title margins during to Toolbar layout if titles don't fit" into lmp-dev 2014-08-29 02:26:24 +00:00
Adam Powell
0c1dc53e74 Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev 2014-08-29 02:25:49 +00:00
Adam Powell
4c9765a654 Don't add title margins during to Toolbar layout if titles don't fit 
When all space is consumed in a Toolbar by other views the special
shared title/subtitle margins shouldn't be added to the running
position during layout.

Bug 17253638

Change-Id: I179fcbf286fa68fd8df6e25bb1879bccbf1532ed
 2014-08-28 19:21:18 -07:00
Adam Lesinski
b32063822b Merge "Stamp platform version code into app Apks" into lmp-dev 2014-08-29 01:54:15 +00:00
Jeff Tinker
67085e1cac Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 2014-08-29 01:45:25 +00:00
Adam Lesinski
7f668d03ce Fix memory leak in ResTable 
We were basically never cleaning any of the
cached bags... oops :S

Bug:16683269
Change-Id: Ic0a44218f660e16fbaac8df1d61ce6f1fdb0018b
 2014-08-28 18:32:32 -07:00
Adam Powell
7c13bc2a70 Add xml attributes to Toolbar for navigation icon 
...to match the existing setters/getters.

Change-Id: I9814c5d7f2aa0559c93fbb74881e29064473f186
 2014-08-28 18:19:59 -07:00
Svetoslav
85933eb18b Merge "Print UI polish." into lmp-dev 2014-08-29 01:18:00 +00:00
Dongwon Kang
13d43b927f Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev 2014-08-29 01:08:50 +00:00
Dianne Hackborn
3d07395206 Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 2014-08-29 00:56:49 +00:00
Dianne Hackborn
ecf1cda068 Debug issue #17310019: pause when launching settings 
Let's log!

Change-Id: Icaf42d46aff6e74ee5fc98611dd77083a5d5052e
 2014-08-28 17:52:33 -07:00
Svetoslav
43da1d4a08 Merge "Fix app widget serices not being unbound." into lmp-dev 2014-08-29 00:51:49 +00:00
Svetoslav
2635b7b0d3 Fix app widget serices not being unbound. 
bug:17321037

Change-Id: I44578df1104f9bd2e28700a3422a3323844d92c0
 2014-08-28 17:41:49 -07:00
Alex Light
e545035e0e Remove obsolete pruneDexCache 
Bug: 16875245

(cherry picked from commit 09107db4916913912e61bfe592643b9c4c50b500)

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
 2014-08-28 17:02:37 -07:00
Alex Light
55471dcd0f Change /dalvik-cache to be owned by root. 
Bug: 16875245

(cherry picked from commit 79bf4007f559e194205f632b23d2bfb6f8d1e7ba)

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
 2014-08-28 17:02:37 -07:00
Dongwon Kang
4c4eadc33d TIF: update the default value documentation of Channels.COLUMN_BROWSABLE. 
Bug: 17310177
Change-Id: Ibd765675983082f63fde3586b7c7cf6cd399c80d
 2014-08-29 08:58:30 +09:00
Dongwon Kang
371bee50f9 Merge "TIF: cosmetic changes for consistency." into lmp-dev 2014-08-28 23:49:33 +00:00
Dongwon Kang
fd8aa02d73 TIF: cosmetic changes for consistency. 
- Remove uncessarry logic in buildTvInputListLocked().
  (No longer needed because we removed availability.
   Verified the bug case, b/15738607, does not happen without this logic.)
- Rename member variables in XXXState classes.
- Define SessionCallback for consistency.

Change-Id: I49642c909ad7f77d97d1d90670c7bb7c2b12cda8
 2014-08-29 08:48:02 +09:00
RoboErik
6a6a8f0094 Fix test build 
Updates for MediaBrowser APIs. I missed some new demos that had been added which use
these APIs.

Change-Id: Ic42c9ba20a851c5b08c564cfc4de71bbe09ebdb9
 2014-08-28 23:37:22 +00:00
Jeff Sharkey
d6b03eecf0 Merge "Teach API lint about package layering!" into lmp-dev 2014-08-28 23:36:25 +00:00
George Mount
7b7499644c am 2d53188b: Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 
* commit '2d53188b2ed3950f4d1c7e5163ba181c83ea5c85':
  Fix NPE when transitioning on unattached scene root.
 2014-08-28 23:33:42 +00:00
George Mount
c07292aa90 am 48514832: Merge "Fix NPE when clicking "back" quickly." into lmp-dev 
* commit '48514832232eee579a1aab76d51c0adc8a36efc0':
  Fix NPE when clicking "back" quickly.
 2014-08-28 23:33:37 +00:00
George Mount
46a761db9a Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 2014-08-28 23:24:06 +00:00
George Mount
0f227c9a3d Merge "Fix NPE when clicking "back" quickly." into lmp-dev 2014-08-28 23:19:38 +00:00
George Mount
6276cd4b8d Fix NPE when transitioning on unattached scene root. 
Bug 17261558

Change-Id: Ib86c72e26f7fd9ac3fc47df650d95fdeeb43f1be
 2014-08-28 16:17:38 -07:00
Jeff Sharkey
932a07cefe Teach API lint about package layering! 
Now it can identify layering violations, like when something deep in
android.os depends on android.app.

Change-Id: I94606c642195b3ed7558ff6979ed4a181cd85fa2
 2014-08-28 16:16:07 -07:00
George Mount
407d1fa52c Fix NPE when clicking "back" quickly. 
Bug 17319368

Change-Id: I8cf544aefa75bd5fe4f606e185f84977a36b0cdc
 2014-08-28 16:11:49 -07:00
John Reck
8d4c198a35 am f26df60e: Merge "Track buildLayer calls, destroy if unused" into lmp-dev 
* commit 'f26df60e4d7a586164bd535b1f86f7971a4f13b4':
  Track buildLayer calls, destroy if unused
 2014-08-28 23:08:53 +00:00