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

154256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
a1b349dda6 Import translations. DO NOT MERGE 
Change-Id: Iefc5dee5e276d96d2b99216963de6b64f8ea631e
Auto-generated-cl: translation import
 2014-08-31 12:44:08 -07:00
Adam Lesinski
5119ea7e35 am 43186e07: am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '43186e0784ff597be49d272d43bd7d3767f9e935':
  Make UsageStats API comply with API Council
 2014-08-29 21:07:20 +00:00
Adam Lesinski
b423a1e22c am 0a18e15b: am 135fba7e: am c169c888: Change platformBuildVersionCode to name in aapt dump badging 
* commit '0a18e15b01cca66bf653082e0308a2565b6f1244':
  Change platformBuildVersionCode to name in aapt dump badging
 2014-08-29 20:33:48 +00:00
Yin-Chia Yeh
4ec4f8f009 am 3c505dae: am b3ff5477: am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev 
* commit '3c505dae125b34483b9173401cb2fe84c86e2485':
  Camera2: Remove spurious warnings
 2014-08-29 20:33:43 +00:00
Igor Murashkin
c57a88c631 am b99ecc40: am e24c71fd: am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 
* commit 'b99ecc40ee77f14ca46e8eaf3484bfc8e3721233':
  camera2: Implement TotalCaptureResult#getPartialResults
 2014-08-29 20:33:38 +00:00
John Reck
f8d104eed8 am 05b4e21e: am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev 
* commit '05b4e21ecda890ca20381384a772b4f7d66157a5':
  Listener callbacks ordering fixups
 2014-08-29 20:33:33 +00:00
Adam Lesinski
d57e1cb644 am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit 'f5e3785e6fc2d4dcbc8ce72ad871a96421ca1f1d':
  Make UsageStats API comply with API Council
 2014-08-29 19:21:28 +00:00
Nancy Chen
230780626f am 3d26fdff: am 67e97c84: am 70475de3: Merge "Hide AIDL for RemoteServiceCallback in telecomm" into lmp-dev 
* commit '3d26fdff928234d76b27248969cebf715921f1ec':
  Hide AIDL for RemoteServiceCallback in telecomm
 2014-08-29 19:16:06 +00:00
John Reck
cd64ea06c1 am 54655a70: am 1099d64b: am 09a0c7c8: Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev 
* commit '54655a70133597998f1ec8be18f47e4573a7d214':
  Free prefetched layers on TRIM_MEMORY
 2014-08-29 19:16:00 +00:00
Svetoslav
eca45d2d8c am 255ef1ef: am 9f6c3630: am 37f72488: Merge "Fix the global gesture to enable accessibility." into lmp-dev 
* commit '255ef1efd15d60e17a6b1fc93ccb0dc78f8ea1ea':
  Fix the global gesture to enable accessibility.
 2014-08-29 19:15:55 +00:00
Lorenzo Colitti
99dbe39234 am 96ec882b: am 64e6f01f: am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev 
* commit '96ec882ba17f542b42b1da453325b8dba9ce67f2':
  Really remove NetworkBoundURLFactory.
 2014-08-29 19:15:49 +00:00
Selim Cinek
ab7640592c am c035cac5: am c0121664: am 702d4abb: Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev 
* commit 'c035cac52d86f4dd97e4c50e477d7b0eed3c5a4a':
  Increasing the delay for the volume warning dialog with talkback
 2014-08-29 19:15:44 +00:00
Jorim Jaggi
6509a5d8b9 am cb9e89ef: am ddd6040d: am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev 
* commit 'cb9e89efa031666568d46ffeb3fb425138ff5c97':
  Revert "Content description for padlock icon depending on state"
 2014-08-29 19:15:38 +00:00
Jorim Jaggi
a760ad3792 am c74fb0eb: am d2f9ac27: am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev 
* commit 'c74fb0ebdb9108f8517e1b54d26305f048c4c9e9':
  Only dismiss Keyguard with space when screen is on
 2014-08-29 19:15:32 +00:00
Jorim Jaggi
c70110fabf am 3a28b9a8: am 243a2bcb: am 35d00b45: Update paddings for more card to match notification layouts 
* commit '3a28b9a8bceee4b48476f1d3518a694801267e4c':
  Update paddings for more card to match notification layouts
 2014-08-29 19:15:27 +00:00
Jorim Jaggi
ff44e803ad am 8219f7cc: am 2157b125: am 99a9436c: Merge "Fix various problems with notification layouts" into lmp-dev 
* commit '8219f7cc7e2fd3e623d8e14260ab720197952c3b':
  Fix various problems with notification layouts
 2014-08-29 19:15:22 +00:00
Neil Fuller
bea2e6d9a2 am 0f2d32e3: am 468b3c5e: am 245eaa25: Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev 
* commit '0f2d32e393f217ed4c3a6e288268f619697dfe74':
  Fixing android.text.format.Time for non-English locales
 2014-08-29 19:15:17 +00:00
Kenny Guy
f7db26a598 am de28d664: am d74446b2: am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev 
* commit 'de28d664e33c27f432f8f0ba379ad213488fd10d':
  Load ApplicationInfo for correct user.
 2014-08-29 19:15:13 +00:00
Yohei Yukawa
af98b01210 am bc51bee9: am 7046f79e: am bbee6beb: Merge "Reject request when any unknown flag is speficied" into lmp-dev 
* commit 'bc51bee9dbcc50a6a5a507e511cdcdf6aa63d054':
  Reject request when any unknown flag is speficied
 2014-08-29 19:15:06 +00:00
Jeff Sharkey
2c653e1a53 am a841cead: am bb50b0b4: am f1ddfd1e: Keep tests building. 
* commit 'a841ceadd9940b8349e49e35693e31918977f29e':
  Keep tests building.
 2014-08-29 19:14:51 +00:00
Jeff Sharkey
9928f2b62a am f751f4d6: am fc5b41eb: am 78c14368: Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev 
* commit 'f751f4d60cc8dae6741f826ec2d959a01fc51f82':
  FileBridge needs to keep strong reference to PFD.
 2014-08-29 19:14:43 +00:00
Jungshik Jang
1e0a8127f4 am c14c0aa3: am 78045632: am 92be4d75: Merge "Fix system audio mode failure in boot up" into lmp-dev 
* commit 'c14c0aa3809f284ea861a63f67c8193a639789e0':
  Fix system audio mode failure in boot up
 2014-08-29 19:14:38 +00:00
Sandeep Siddhartha
7f31f82432 am 601d017c: am efe6c903: am cffbcb8a: Merge "Address API review comments" into lmp-dev 
* commit '601d017c2209f0a7930503a0bc97b4e762e4e8a1':
  Address API review comments
 2014-08-29 19:14:33 +00:00
Adam Lesinski
c51cc683bc am 056468ef: am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '056468ef3b9b63d251c4aac867ae634f813d18cf':
  Fix memory leak in ResTable
 2014-08-29 19:14:28 +00:00
Terry Heo
e5e1d6da5f am 1f0736a0: am b2357d5a: am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev 
* commit '1f0736a064e2911a5ad76f49d32cda88fb4f53f4':
  CEC: Implement dump() of HdmiControlService
 2014-08-29 19:14:23 +00:00
Adam Powell
3367283946 am 7f729bf6: am 41d34328: am ae806d87: Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev 
* commit '7f729bf64fa345afbb16e762dfe916ecd94015ce':
  Doc improvements for new Toolbar changes, now with attributes.
 2014-08-29 19:14:18 +00:00
Adam Powell
8f8cfdb921 am df186cea: am 1ae3bf17: am cbed634a: Merge "Don\'t add title margins during to Toolbar layout if titles don\'t fit" into lmp-dev 
* commit 'df186cea1a71928839efe2b56b01ecdfdbfdbd4f':
  Don't add title margins during to Toolbar layout if titles don't fit
 2014-08-29 19:14:12 +00:00
Adam Powell
0372031382 am 7faa69ce: am 32e9145c: am 31192ba8: Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev 
* commit '7faa69ced32f3f3ce0f8ec3143f6d90d24b0dfc3':
  Add xml attributes to Toolbar for navigation icon
 2014-08-29 19:14:06 +00:00
Adam Lesinski
1be18d56a1 am 9e186ec3: am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit '9e186ec3a0e87e612786b827c04b6c6e1b507196':
  Stamp platform version code into app Apks
 2014-08-29 19:14:01 +00:00
Jeff Tinker
44e21a21b0 am 576dc318: am d83b4f16: am b8ccb705: Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 
* commit '576dc3188364d54137151913230b01ab18af2324':
  Fix exception message string formatting in MediaDrm
 2014-08-29 19:13:55 +00:00
Svetoslav
8a01aa95f4 am 58691e29: am 221ae208: am 6a353ad0: Merge "Print UI polish." into lmp-dev 
* commit '58691e2945f554849d606a6ed052c181e227e4ac':
  Print UI polish.
 2014-08-29 19:13:50 +00:00
Adam Lesinski
05f2119432 am 135fba7e: am c169c888: Change platformBuildVersionCode to name in aapt dump badging 
* commit '135fba7ecdf4bb697b004329c6070a2ef544d8e3':
  Change platformBuildVersionCode to name in aapt dump badging
 2014-08-29 19:07:34 +00:00
Yin-Chia Yeh
fc90ddcf92 am b3ff5477: am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev 
* commit 'b3ff5477cd4d72631551bac81c543ed74179eda3':
  Camera2: Remove spurious warnings
 2014-08-29 19:07:02 +00:00
Igor Murashkin
80bcba6413 am e24c71fd: am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 
* commit 'e24c71fd133ba2564e84b4d171689a48f37c070a':
  camera2: Implement TotalCaptureResult#getPartialResults
 2014-08-29 19:06:57 +00:00
John Reck
b46c52209f am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev 
* commit '724fff2034e17c601a3787792f8fb73172862c18':
  Listener callbacks ordering fixups
 2014-08-29 19:06:53 +00:00
Adam Lesinski
fc66c98750 am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '84b95b6634be81d9368f13c38ab86d28f591c478':
  Make UsageStats API comply with API Council
 2014-08-29 19:06:29 +00:00
Adam Lesinski
a496b1a7f3 Merge "Make UsageStats API comply with API Council" into lmp-dev 2014-08-29 18:56:24 +00:00
Nancy Chen
7e1ec4dfe1 am 67e97c84: am 70475de3: Merge "Hide AIDL for RemoteServiceCallback in telecomm" into lmp-dev 
* commit '67e97c84f36b27cf233f3da359c7a158ec43c3e2':
  Hide AIDL for RemoteServiceCallback in telecomm
 2014-08-29 18:52:53 +00:00
John Reck
ecb8785efc am 1099d64b: am 09a0c7c8: Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev 
* commit '1099d64b40f555da92a7aee56c55a20a6f5c24f8':
  Free prefetched layers on TRIM_MEMORY
 2014-08-29 18:52:48 +00:00
Svetoslav
5acf03c481 am 9f6c3630: am 37f72488: Merge "Fix the global gesture to enable accessibility." into lmp-dev 
* commit '9f6c36305e2dcb385b157fb3e85cac80193cabdb':
  Fix the global gesture to enable accessibility.
 2014-08-29 18:52:42 +00:00
Lorenzo Colitti
f97b6bfb21 am 64e6f01f: am 8a44b09d: Merge "Really remove NetworkBoundURLFactory." into lmp-dev 
* commit '64e6f01ff36bdfd6ba58436c35701d68ad174790':
  Really remove NetworkBoundURLFactory.
 2014-08-29 18:52:37 +00:00
Selim Cinek
d87f226129 am c0121664: am 702d4abb: Merge "Increasing the delay for the volume warning dialog with talkback" into lmp-dev 
* commit 'c01216640b76f6511d2b3320f83eef14e74ecbfc':
  Increasing the delay for the volume warning dialog with talkback
 2014-08-29 18:52:32 +00:00
Jorim Jaggi
2e09793c2e am ddd6040d: am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev 
* commit 'ddd6040dadfe56f5bc9809e436f4a75538296a38':
  Revert "Content description for padlock icon depending on state"
 2014-08-29 18:52:27 +00:00
Jorim Jaggi
0c91868065 am d2f9ac27: am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev 
* commit 'd2f9ac2729876aa7eab211e9698d1035d2b2c623':
  Only dismiss Keyguard with space when screen is on
 2014-08-29 18:52:07 +00:00
Jorim Jaggi
3db48ac715 am 243a2bcb: am 35d00b45: Update paddings for more card to match notification layouts 
* commit '243a2bcb25c3dc3dfdf13fe81d1f840ae35b7b22':
  Update paddings for more card to match notification layouts
 2014-08-29 18:52:02 +00:00
Jorim Jaggi
2c71e55706 am 2157b125: am 99a9436c: Merge "Fix various problems with notification layouts" into lmp-dev 
* commit '2157b125c0071f27500ae0e69bd21588027c0b3b':
  Fix various problems with notification layouts
 2014-08-29 18:51:04 +00:00
Neil Fuller
95126ae207 am 468b3c5e: am 245eaa25: Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev 
* commit '468b3c5e8133e6d9d4e48b3d67cac982e24a9c5a':
  Fixing android.text.format.Time for non-English locales
 2014-08-29 18:50:42 +00:00
Kenny Guy
42fc95cedc am d74446b2: am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev 
* commit 'd74446b251aa2258ef6bbff33019a236836630be':
  Load ApplicationInfo for correct user.
 2014-08-29 18:50:30 +00:00
Yohei Yukawa
4bf61aa61e am 7046f79e: am bbee6beb: Merge "Reject request when any unknown flag is speficied" into lmp-dev 
* commit '7046f79ec9c9b0510af0f541f0e135b8a1ad4f5d':
  Reject request when any unknown flag is speficied
 2014-08-29 18:50:18 +00:00
Jeff Sharkey
01e7bc6e6c am bb50b0b4: am f1ddfd1e: Keep tests building. 
* commit 'bb50b0b4f3f7b738317cf905c7ef6274e89828c7':
  Keep tests building.
 2014-08-29 18:50:08 +00:00