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

113853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
62642e1b8e am 3b3b2efb: am fff175ae: Merge "Part of corrections from KLP API Review: Media" into klp-dev 
* commit '3b3b2efb077b56f65a9c48c95f8dfab9af5ec531':
  Part of corrections from KLP API Review: Media
 2013-09-13 17:32:10 -07:00
Chris Craik
d3979bc5a7 am bb451bda: am 0d3c52d3: Merge "Fix merged operation clipping" into klp-dev 
* commit 'bb451bda4a08f79b60f84242647bdb40962f01b5':
  Fix merged operation clipping
 2013-09-13 17:32:06 -07:00
Christopher Tate
c083cb719a am 5de04119: am 0f8ec44b: Merge "Prune shared users that the system declares but does not use" into klp-dev 
* commit '5de041193cec58e8ee40a62c760b24141455b2f8':
  Prune shared users that the system declares but does not use
 2013-09-13 17:32:02 -07:00
Glenn Kasten
c8b9ea3d02 am edc538a7: am 0f3e1487: Merge "Remove obsolete assets from target /system/media/video/" into klp-dev 
* commit 'edc538a7936925edb9767148dee39f3e78b9ef08':
  Remove obsolete assets from target /system/media/video/
 2013-09-13 17:30:57 -07:00
Dianne Hackborn
6cc372b16a am 0af9fb52: am 236afa0d: Merge "Fix issue #10747324: adb install hangs" into klp-dev 
* commit '0af9fb526b67ddb2d7f55dabef4379f46b622d57':
  Fix issue #10747324: adb install hangs
 2013-09-13 17:30:53 -07:00
Adam Powell
f206b5935e am 3cfc5995: am 3157e73f: Merge "Don\'t recycle action button views" into klp-dev 
* commit '3cfc5995bfa5d9d4c9203991131d76947c572b58':
  Don't recycle action button views
 2013-09-13 17:30:48 -07:00
Rachad Alao
1f54af0996 am 00b3f942: am 4fe6429b: Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev 
* commit '00b3f942e45f08b4f1e86a6c9c8cdaecf4efecc4':
  Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
 2013-09-13 17:30:45 -07:00
Jeff Sharkey
be9e10a26d am 56cb98e8: am 12c7a0c9: Merge "More UX updates around picking images." into klp-dev 
* commit '56cb98e8f122f202f76e9b9cc072a72b80ef6600':
  More UX updates around picking images.
 2013-09-13 17:30:41 -07:00
Craig Mautner
5bb9c2edb7 am f6f36a95: am 540421ba: Merge "When launching home activity, make sure it is top." into klp-dev 
* commit 'f6f36a95a238381740a92263a76af790bc93ae37':
  When launching home activity, make sure it is top.
 2013-09-13 17:30:36 -07:00
Vineeta Srivastava
6a60c7bd4e am 2089abdf: am 45fa4219: Merge "Roaming Icon should not displayed with Indosat\'s old SIM" into klp-dev 
* commit '2089abdf787df5a179db6486f39441c57db82833':
  Roaming Icon should not displayed with Indosat's old SIM
 2013-09-13 17:30:33 -07:00
Dianne Hackborn
1cd9a73ac0 am f3b4cf7d: am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev 
* commit 'f3b4cf7d01b68418dd652e201868d140de081bd8':
  Implement #10749688: Improve low memory reporting
 2013-09-13 17:30:31 -07:00
Zhihai Xu
078c1f3606 am a33ebcb9: am 78d47240: Merge "Fixed review comments" into klp-dev 
* commit 'a33ebcb9edd5d8a8148d9080d2bf48b76d2b93fb':
  Fixed review comments
 2013-09-13 17:30:27 -07:00
Victoria Lease
a98655f053 am fff3f7cc: am 22e2c225: Merge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev 
* commit 'fff3f7cc824ea92fd14e8e528baf06d1af620749':
  NotoColorEmoji.ttf is the new AndroidEmoji.ttf
 2013-09-13 17:30:24 -07:00
Baligh Uddin
4e87843a20 am 649bb2dc: (-s ours) am 62f3bdec: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '649bb2dc30f6b43806c52829f9329f8d35f1ecd5':
  Import translations. DO NOT MERGE
 2013-09-13 17:30:21 -07:00
Deepanshu Gupta
f392e5d4f6 am 68862f07: (-s ours) am 79a1a7c3: am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '68862f07b6b8421a2d0aeafe62e4285525e14166':
  Fix ClassCastException when rendering ListView
 2013-09-13 17:30:18 -07:00
Adam Powell
db34f3d17d am 50e5814c: Merge "Check RelativeLayout\'s access of its own LayoutParams during measurement" into klp-dev 
* commit '50e5814c337f67c74d9e249cf6f67ac86dfc832d':
  Check RelativeLayout's access of its own LayoutParams during measurement
 2013-09-13 17:26:27 -07:00
Dianne Hackborn
5b7359aa44 am 76adfd71: Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev 
* commit '76adfd71f1ebdf50a03c85e2a7c87d5691f81b13':
  Fix issue #10461477: KLP API Review: Debug.MemoryInfo
 2013-09-13 17:26:24 -07:00
Adam Powell
50e5814c33 Merge "Check RelativeLayout's access of its own LayoutParams during measurement" into klp-dev 2013-09-14 00:23:07 +00:00
Wink Saville
d80b0a9515 am 12d3f488: am 7770dcc3: Merge "checkMobileProvisioning should not block." into klp-dev 
* commit '12d3f488e79ba5afcc30bb2b4e555d06b2a34c74':
  checkMobileProvisioning should not block.
 2013-09-13 17:22:56 -07:00
Jason Monk
103a02453b am f9464838: am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 
* commit 'f9464838fe141aac1c677e2f4ec0133381fbb5af':
  Guarantee that PAC Local Proxy owns Port
 2013-09-13 17:22:53 -07:00
Scott Main
94a766a342 am bd04940c: am cac2428d: am a73e5df0: am cdde6dc6: am 95e7df91: fix title for uses-sdk doc 
* commit 'bd04940ca71d977c75c704a835faade2d311ab96':
  fix title for uses-sdk doc
 2013-09-13 17:22:49 -07:00
Christopher Tate
9b6c9a1592 am fcda3283: am 7560c256: Merge "Add hidden API for querying available \'home\' activities" into klp-dev 
* commit 'fcda3283d27f8dfaa812fb735af43eea2e077c64':
  Add hidden API for querying available 'home' activities
 2013-09-13 17:22:45 -07:00
Jeff Sharkey
4c7c51480e am f5513f41: am 0bf2ed90: Merge "Move search to roots; Documents root; hide empty." into klp-dev 
* commit 'f5513f41fe041bef29ec70abdce7cc6f582a11c2':
  Move search to roots; Documents root; hide empty.
 2013-09-13 17:22:41 -07:00
Jeff Tinker
3b3b2efb07 am fff175ae: Merge "Part of corrections from KLP API Review: Media" into klp-dev 
* commit 'fff175aedc86a176fb6ceafe00fe5a26adc5d909':
  Part of corrections from KLP API Review: Media
 2013-09-13 17:22:31 -07:00
Chris Craik
bb451bda4a am 0d3c52d3: Merge "Fix merged operation clipping" into klp-dev 
* commit '0d3c52d3afc1e3ea4ae2ea63355388a095ebeb4c':
  Fix merged operation clipping
 2013-09-13 17:22:27 -07:00
Christopher Tate
5de041193c am 0f8ec44b: Merge "Prune shared users that the system declares but does not use" into klp-dev 
* commit '0f8ec44b13487f5726cab77eb79cac016e090b25':
  Prune shared users that the system declares but does not use
 2013-09-13 17:22:24 -07:00
Dianne Hackborn
76adfd71f1 Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev 2013-09-14 00:22:06 +00:00
Dianne Hackborn
3fa8969021 Fix issue #10461477: KLP API Review: Debug.MemoryInfo 
Oops.

Change-Id: I2143790af9e6649dba8d74618358c47232cf6cc4
 2013-09-13 17:20:00 -07:00
Jeff Tinker
fff175aedc Merge "Part of corrections from KLP API Review: Media" into klp-dev 2013-09-14 00:16:34 +00:00
Glenn Kasten
edc538a793 am 0f3e1487: Merge "Remove obsolete assets from target /system/media/video/" into klp-dev 
* commit '0f3e1487b26a822697f70747290809081c2072cc':
  Remove obsolete assets from target /system/media/video/
 2013-09-13 17:16:19 -07:00
Dianne Hackborn
0af9fb526b am 236afa0d: Merge "Fix issue #10747324: adb install hangs" into klp-dev 
* commit '236afa0d8b3e146c97801bd72a224b0908cd93f9':
  Fix issue #10747324: adb install hangs
 2013-09-13 17:16:13 -07:00
Adam Powell
3cfc5995bf am 3157e73f: Merge "Don\'t recycle action button views" into klp-dev 
* commit '3157e73fb0ea392b8dd2a6bbf6b74d8dfa54cc52':
  Don't recycle action button views
 2013-09-13 17:16:08 -07:00
Rachad Alao
00b3f942e4 am 4fe6429b: Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev 
* commit '4fe6429ba2c77a2cc639d712ba979e1f538c5bb1':
  Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
 2013-09-13 17:16:05 -07:00
Jeff Sharkey
56cb98e8f1 am 12c7a0c9: Merge "More UX updates around picking images." into klp-dev 
* commit '12c7a0c970dfa56391f1e7f7a8ed41348acb14c4':
  More UX updates around picking images.
 2013-09-13 17:16:01 -07:00
Craig Mautner
f6f36a95a2 am 540421ba: Merge "When launching home activity, make sure it is top." into klp-dev 
* commit '540421ba984655b07f2b70bae1db9ae1bc3052aa':
  When launching home activity, make sure it is top.
 2013-09-13 17:15:58 -07:00
Vineeta Srivastava
2089abdf78 am 45fa4219: Merge "Roaming Icon should not displayed with Indosat\'s old SIM" into klp-dev 
* commit '45fa42195efc6f3d7ca531d405905963a4de6e0e':
  Roaming Icon should not displayed with Indosat's old SIM
 2013-09-13 17:15:55 -07:00
Dianne Hackborn
f3b4cf7d01 am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev 
* commit '28eeb42012018bfa3cffc77e9a970e8f5c13f70b':
  Implement #10749688: Improve low memory reporting
 2013-09-13 17:15:23 -07:00
Zhihai Xu
a33ebcb9ed am 78d47240: Merge "Fixed review comments" into klp-dev 
* commit '78d47240fb71a55897c1ef2e2d06492acbe29ad6':
  Fixed review comments
 2013-09-13 17:15:17 -07:00
Victoria Lease
fff3f7cc82 am 22e2c225: Merge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev 
* commit '22e2c2254244da4cf9ead06a6d03dc21b54d2a8a':
  NotoColorEmoji.ttf is the new AndroidEmoji.ttf
 2013-09-13 17:15:03 -07:00
Baligh Uddin
649bb2dc30 am 62f3bdec: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '62f3bdecc049464617328638d32ddca3bfb3e860':
  Import translations. DO NOT MERGE
 2013-09-13 17:14:58 -07:00
Deepanshu Gupta
68862f07b6 am 79a1a7c3: am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '79a1a7c367214e86d1ea18fe07bc4d2d5bc00f76':
  Fix ClassCastException when rendering ListView
 2013-09-13 17:14:48 -07:00
Wink Saville
12d3f488e7 am 7770dcc3: Merge "checkMobileProvisioning should not block." into klp-dev 
* commit '7770dcc3d351a494d0f5fe44feb776cc512e9b18':
  checkMobileProvisioning should not block.
 2013-09-13 17:14:15 -07:00
Jason Monk
f9464838fe am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 
* commit '312c495f4b8d002264772f61fe1fa3ef87bf3e52':
  Guarantee that PAC Local Proxy owns Port
 2013-09-13 17:14:10 -07:00
Scott Main
bd04940ca7 am cac2428d: am a73e5df0: am cdde6dc6: am 95e7df91: fix title for uses-sdk doc 
* commit 'cac2428da4a22d9526af09e1457a6b644b2c2057':
  fix title for uses-sdk doc
 2013-09-13 17:14:05 -07:00
Christopher Tate
fcda3283d2 am 7560c256: Merge "Add hidden API for querying available \'home\' activities" into klp-dev 
* commit '7560c256ecacb5fa3904ec5c957e88331328f38b':
  Add hidden API for querying available 'home' activities
 2013-09-13 17:14:00 -07:00
Jeff Sharkey
f5513f41fe am 0bf2ed90: Merge "Move search to roots; Documents root; hide empty." into klp-dev 
* commit '0bf2ed90c42d3a1f1d4be4b70c337f9eaec9cd14':
  Move search to roots; Documents root; hide empty.
 2013-09-13 17:13:56 -07:00
Chris Craik
0d3c52d3af Merge "Fix merged operation clipping" into klp-dev 2013-09-14 00:12:37 +00:00
Christopher Tate
0f8ec44b13 Merge "Prune shared users that the system declares but does not use" into klp-dev 2013-09-14 00:11:48 +00:00
Glenn Kasten
0f3e1487b2 Merge "Remove obsolete assets from target /system/media/video/" into klp-dev 2013-09-14 00:07:44 +00:00
Dianne Hackborn
236afa0d8b Merge "Fix issue #10747324: adb install hangs" into klp-dev 2013-09-14 00:04:43 +00:00