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

115886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
f5d35c9bd0 am 84e0766c: am 43bd3f24: am 3d61bf45: Merge "Replace searchlight asset" into klp-dev 
* commit '84e0766cbe75c88055298081b52a409ab14db256':
  Replace searchlight asset
 2013-10-04 11:10:27 -07:00
Jim Miller
2bd9e8cec1 am 8995c51d: am 3efc75ac: am fea784dd: Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev 
* commit '8995c51d1d071cf1dc4505e0da8eb2fb23e18dd0':
  Fix bug where dismiss() was being called from the wrong thread
 2013-10-04 11:10:23 -07:00
Adam Powell
e580a2f1a1 am bf7116a9: am 049e663c: am 8c5b15c6: Merge "Fix a bug in action menu measurement" into klp-dev 
* commit 'bf7116a9ddeff368b6a33fabfaa82ce974d5ee0d':
  Fix a bug in action menu measurement
 2013-10-04 11:10:20 -07:00
Wink Saville
0cbc781134 am e7329140: am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'e7329140c0ff846acf5bc8749f525b18880177ef':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-04 11:10:16 -07:00
Vinit Deshapnde
2ecde96ad4 am c9ed4e98: am 78624d61: am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev 
* commit 'c9ed4e98b880926d0621f10f8a9ce7a6b5f2016b':
  Set P2p statemachine's network manager before starting Wifi
 2013-10-04 11:10:11 -07:00
Adam Powell
f7ee79b6bf am 3a1abeac: am cf51fefd: am c7c7f5b5: Merge "Fix docs" into klp-dev 
* commit '3a1abeac3526bb772d484a16a4110241f6ab090c':
  Fix docs
 2013-10-04 11:10:08 -07:00
Yuhao Zheng
fdee07a9df am d82800b8: am 4ee58568: am f3ca9477: Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev 
* commit 'd82800b890f87dc42939bacd520b85e1fde22328':
  New Telephony APIs to return MMS UA and UAProfUrl
 2013-10-04 11:10:04 -07:00
Chet Haase
f642163761 am 74cf1456: am f37696b7: am 76a5c86d: Merge "Fix lockscreen wave animation artifacts" into klp-dev 
* commit '74cf1456466bf5d1551f097611219ad6605800a3':
  Fix lockscreen wave animation artifacts
 2013-10-04 11:09:46 -07:00
Adam Powell
5abb64d801 am 91aa6021: am 310796de: am d6239b92: Merge "Add a scrubber to keyguard; layout tweaks" into klp-dev 
* commit '91aa6021876e1690ad84ca0b3304ca7b0f925e80':
  Add a scrubber to keyguard; layout tweaks
 2013-10-04 11:09:12 -07:00
Jim Miller
2b0cb8c347 am 6689a7e8: am 44c4dd93: am 8990e28b: Merge "Update default keyguard clock to new UX specification" into klp-dev 
* commit '6689a7e8efd559039465c37f577ef367f462cecc':
  Update default keyguard clock to new UX specification
 2013-10-04 11:08:19 -07:00
Michael Wright
1626ea51a8 am 4138766a: am 448a1f6f: am cf5b34b0: Merge "Ensure WallpaperEngine has correct size information" into klp-dev 
* commit '4138766ab6fbbc1e010609f85fe5941405d23fa4':
  Ensure WallpaperEngine has correct size information
 2013-10-04 11:08:15 -07:00
Craig Mautner
ff942d6d83 am 3ab914cf: am 63c375d3: am 27b82632: Merge "Retain IME assignment if no windows accept input." into klp-dev 
* commit '3ab914cfa504c758ecac4fd8272da36893b8e85c':
  Retain IME assignment if no windows accept input.
 2013-10-04 11:08:10 -07:00
Vinit Deshapnde
1e9863f06a am 90a5192c: am e72aa641: am 3eb6e4b4: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 
* commit '90a5192cd4af89a1b363ca25be2a63d0e57010d4':
  Fix EAP-TLS reconnect after reboot issue
 2013-10-04 11:08:06 -07:00
Marco Nelissen
1ff5ad874e am 2c64e2be: (-s ours) am 70cd6886: am fb45a2e9: Merge "Fix layoutlib build" into klp-dev 
* commit '2c64e2be0cf2e1fa537a0c0d353f3a8c9d5852d4':
  Fix layoutlib build
 2013-10-04 11:08:03 -07:00
Alan Viverette
1461e26674 resolved conflicts for merge of 92a827b8 to master 
Change-Id: Ia262f5c80cdaa391db08f766cee62919a8705e80
 2013-10-04 10:17:09 -07:00
Dianne Hackborn
a37bbc6afc am 8a5f7ab6: am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev 
* commit '8a5f7ab6e18e05a54a3ae7e0acb7e1b728ad613c':
  KLP/KitKat is now API 19.
 2013-10-04 09:11:32 -07:00
Jonathan Dixon
4aa55c006f am 34eb4f3d: am 4730dda8: am 46507f4b: Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 
* commit '34eb4f3d167cb0af07f772a1bfe56603ec3dd268':
  Decouple construction of WebView, CookieSyncManager, WebViewDatabase
 2013-10-04 09:11:28 -07:00
Eino-Ville Talvala
0974bcbfbd am 61e5349d: am 31ea028e: am b77b7bab: Merge "Camera2: Implement idle callbacks" into klp-dev 
* commit '61e5349dfbed1b09b1c99a56ef03c3ad95755ffc':
  Camera2: Implement idle callbacks
 2013-10-04 09:11:24 -07:00
Dianne Hackborn
6588538ec5 am 7c55154d: am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '7c55154d4776896c3e602f4739fd5b9cbbf1dba4':
  Implement issue #11050739: Show swapped out RAM
 2013-10-04 09:11:17 -07:00
Dianne Hackborn
4bfeed9499 am 61509ca5: am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '61509ca5bafbe59e29e1eaaaa938c5a668352cba':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-04 09:11:14 -07:00
Dianne Hackborn
54588821b1 am 5eaac1ce: am e31f959c: am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit '5eaac1ce334c0a488fee44d1a9ef5f20ff7d84ea':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String
 2013-10-04 09:11:10 -07:00
Dianne Hackborn
10a4d0b46e am 495fe22d: am 2d3f995a: am d585f954: Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit '495fe22d680c1674598184d08a01d5b961c13fc5':
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
 2013-10-04 09:11:07 -07:00
Daniel Sandler
cf4ed58514 am 12aea9d7: am 97bc628f: am 0a660528: Merge "Goo goo ga joob." into klp-dev 
* commit '12aea9d7972abad702f9ded550179af722acdf47':
  Goo goo ga joob.
 2013-10-04 09:11:03 -07:00
Jeff Sharkey
612fddebaa am 9701c4ef: am 3adf2172: am fe5bf7a7: Merge "Fix mount path prefix checking." into klp-dev 
* commit '9701c4ef1d72f731f3519cfb2036315b5f1f4f1e':
  Fix mount path prefix checking.
 2013-10-04 09:10:56 -07:00
Marco Nelissen
2a0a5d1022 am d9ff894e: am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit 'd9ff894eae0b3acd3c89585a80ebd2039ed1de8c':
  Add PowerManager method to assign blame to a single uid
 2013-10-04 09:10:53 -07:00
John Spurlock
e9335bab10 am 12585551: am c4b27478: am 8e0ca288: Window decor rect should not include the nav bar if hidden. 
* commit '12585551f4ccf08906519b9e8e9b29a5b5de93b0':
  Window decor rect should not include the nav bar if hidden.
 2013-10-04 09:10:48 -07:00
Baligh Uddin
414fb0df7b am 1b7ed578: (-s ours) am dd3162d9: (-s ours) am 778c2de0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1b7ed578f2b8bd0a356f5221551c4b87db31b528':
  Import translations. DO NOT MERGE
 2013-10-04 09:10:45 -07:00
Baligh Uddin
8141901787 am 18dc3d1f: (-s ours) am 7c15b5f7: (-s ours) am 8e68d5fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '18dc3d1f0a8f195e0ad525b084f4b913b2562e5f':
  Import translations. DO NOT MERGE
 2013-10-04 09:10:41 -07:00
Baligh Uddin
1f9b7dcb48 am 30d87502: (-s ours) am a928cfd0: (-s ours) am 65f57e5f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '30d87502bf42a6a0257bca5fc0cbe1648a5cdbcd':
  Import translations. DO NOT MERGE
 2013-10-04 09:10:38 -07:00
Baligh Uddin
91c4d3f4ae am 608d9db2: (-s ours) am b3186207: (-s ours) am 68e70f9b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '608d9db23d1f09381400f3796ae7cb98527a5c11':
  Import translations. DO NOT MERGE
 2013-10-04 09:10:35 -07:00
Baligh Uddin
b93bc98039 am b67ca363: (-s ours) am 079fe0fb: (-s ours) am a6b90f39: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b67ca3634cd970b77aadcf4ca9af19955ae5d12d':
  Import translations. DO NOT MERGE
 2013-10-04 09:10:32 -07:00
John Spurlock
528e60be6b am 89862d73: am c20988e1: am 0ea4a5fb: Merge "Replace linear GradientDrawable with asset-based approach." into klp-dev 
* commit '89862d73ceee0db93821df8c53afb3031ef06ed9':
  Replace linear GradientDrawable with asset-based approach.
 2013-10-04 09:10:29 -07:00
Craig Mautner
a015e9d850 am 71bbf108: am b690557c: am 02fa2332: Merge "Make DimLayer size dependent on stack layout." into klp-dev 
* commit '71bbf1086db0303ee8e5f8bea6bde68d25fcc57a':
  Make DimLayer size dependent on stack layout.
 2013-10-04 09:10:26 -07:00
John Spurlock
b7ba2630bd am bee8af82: am c3752cfb: am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev 
* commit 'bee8af8207938fb0d29b38d915be1803edc64d69':
  Store decor rects per window for transition cropping.
 2013-10-04 09:10:17 -07:00
John Reck
9aeb62cfa5 am 35f2dcd0: (-s ours) am cdc605c6: am b885435c: Merge "Update liblayout" into klp-dev 
* commit '35f2dcd02ca3610c1712010d3189e620bdd7e9b6':
  Update liblayout
 2013-10-04 09:10:15 -07:00
Jim Miller
84e0766cbe am 43bd3f24: am 3d61bf45: Merge "Replace searchlight asset" into klp-dev 
* commit '43bd3f2459642f38f88e9aa90a05a50ea21ba010':
  Replace searchlight asset
 2013-10-03 21:30:39 -07:00
Jim Miller
8995c51d1d am 3efc75ac: am fea784dd: Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev 
* commit '3efc75acce4c77c5ef62e6ff6ac57410ec53bde7':
  Fix bug where dismiss() was being called from the wrong thread
 2013-10-03 21:30:35 -07:00
Adam Powell
bf7116a9dd am 049e663c: am 8c5b15c6: Merge "Fix a bug in action menu measurement" into klp-dev 
* commit '049e663c3bedda1b86d9276eaf660ba8571e375b':
  Fix a bug in action menu measurement
 2013-10-03 21:30:32 -07:00
Wink Saville
e7329140c0 am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'fe587dba3a70c658140eac1b13996b7d8e6eeda2':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-03 21:30:29 -07:00
Vinit Deshapnde
c9ed4e98b8 am 78624d61: am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev 
* commit '78624d61f1a138610bdbffe3d1c6ddf89f3472c8':
  Set P2p statemachine's network manager before starting Wifi
 2013-10-03 21:30:26 -07:00
Adam Powell
3a1abeac35 am cf51fefd: am c7c7f5b5: Merge "Fix docs" into klp-dev 
* commit 'cf51fefde37b0f786e6abdda700d49091fc36491':
  Fix docs
 2013-10-03 21:30:21 -07:00
Yuhao Zheng
d82800b890 am 4ee58568: am f3ca9477: Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev 
* commit '4ee58568b632c3374e54e84a3114592826241c5a':
  New Telephony APIs to return MMS UA and UAProfUrl
 2013-10-03 21:30:18 -07:00
Jim Miller
43bd3f2459 am 3d61bf45: Merge "Replace searchlight asset" into klp-dev 
* commit '3d61bf45e559e084fa173bd50e2e7d7286dc9a35':
  Replace searchlight asset
 2013-10-03 21:27:20 -07:00
Jim Miller
3efc75acce am fea784dd: Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev 
* commit 'fea784ddec162951e95e91010b25ffb65fe704db':
  Fix bug where dismiss() was being called from the wrong thread
 2013-10-03 21:27:17 -07:00
Adam Powell
049e663c3b am 8c5b15c6: Merge "Fix a bug in action menu measurement" into klp-dev 
* commit '8c5b15c628b89c4fb832b7311e5d13ccea4aff04':
  Fix a bug in action menu measurement
 2013-10-03 21:27:14 -07:00
Wink Saville
fe587dba3a am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'a48ccdd6fb671435ed2583830b2828450bfc3cde':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-03 21:27:11 -07:00
Vinit Deshapnde
78624d61f1 am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev 
* commit '5eb2b0ca76560cb8d707295aec42cb72f379eafe':
  Set P2p statemachine's network manager before starting Wifi
 2013-10-03 21:27:09 -07:00
Adam Powell
cf51fefde3 am c7c7f5b5: Merge "Fix docs" into klp-dev 
* commit 'c7c7f5b5d5346a31db87e98ad5214e8110f1846c':
  Fix docs
 2013-10-03 21:27:06 -07:00
Yuhao Zheng
4ee58568b6 am f3ca9477: Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev 
* commit 'f3ca947784571a554ef862e0e8ba01eff3cfa004':
  New Telephony APIs to return MMS UA and UAProfUrl
 2013-10-03 21:27:04 -07:00
Jim Miller
3d61bf45e5 Merge "Replace searchlight asset" into klp-dev 2013-10-04 02:26:56 +00:00