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

144882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Behdad Esfahbod
c68765fe05 am 0249bfc1: am ed160c28: Merge "Add letter-spacing to Paint and TextView" into lmp-dev 
* commit '0249bfc12d91792bd38f7f0535770dd1756ab632':
  Add letter-spacing to Paint and TextView
 2014-07-24 23:37:08 +00:00
Prashant Malani
8ddba1e8e9 am 992f4dee: am 16d220d9: Merge "resolved conflicts for merge of bc3699b1 to lmp-dev" into lmp-dev 
* commit '992f4dee4c7e7de7d659129c979187f7e3317607':
  Revert "Remove circular mask"
 2014-07-24 23:36:50 +00:00
Selim Gurun
1da2179e95 am bc19d47a: am 773433af: Merge "Address API review" into lmp-dev 
* commit 'bc19d47ac43698f48548e703ef6a379e9b79ea04':
  Address API review
 2014-07-24 23:36:25 +00:00
John Spurlock
7bf01fea4a am 8ef42a40: am a20b6388: Merge "QS: Handle all camera api exceptions during init." into lmp-dev 
* commit '8ef42a40fed1234220386a2b76e9dacf814e948d':
  QS: Handle all camera api exceptions during init.
 2014-07-24 23:36:20 +00:00
John Reck
25307213e3 am 2b543d34: am 7f6c99df: Merge "fix build" into lmp-dev 
* commit '2b543d34102960637054191a551b59ae0afc9223':
  fix build
 2014-07-24 23:36:00 +00:00
Robert Greenwalt
eeaea4f902 am 142fc0ca: am 457a09d5: Merge "Fix DUN-based tethering." into lmp-dev 
* commit '142fc0ca3326c87b43f873e0a749be78436aa173':
  Fix DUN-based tethering.
 2014-07-24 23:35:57 +00:00
Yao Chen
780e001a96 am 17c10b1e: am 5599c63b: Use a sequence number for thumbnail callback. 
* commit '17c10b1e1435a1dd1eba0983676ab3f7fa326d71':
  Use a sequence number for thumbnail callback.
 2014-07-24 23:35:53 +00:00
John Reck
15a807bb9c am 4afa4696: am c8f0e9b1: Fix ALL compile warnings 
* commit '4afa469652dd6baa277b57cb584c08cccaf23c50':
  Fix ALL compile warnings
 2014-07-24 23:35:38 +00:00
George Mount
04560442b0 am 610ac231: am fc687570: Merge "Fix no transition when only shared element exists." into lmp-dev 
* commit '610ac231a7af5d9a2e192d24b6a5f10176f6ef8b':
  Fix no transition when only shared element exists.
 2014-07-24 23:35:31 +00:00
Jean-Michel Trivi
00312cb2f7 am 7a1b3309: am a71bb88d: Merge "Remove MediaFocusControl persisting media button receiver" into lmp-dev 
* commit '7a1b3309d47a68a6d1bcaf509039b338c1509965':
  Remove MediaFocusControl persisting media button receiver
 2014-07-24 23:35:20 +00:00
Baligh Uddin
832c138adc am fcb93331: (-s ours) am ee7df0a3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'fcb933312bac8e82bf08da6f7caafdbc45c2ec87':
  Import translations. DO NOT MERGE
 2014-07-24 23:35:15 +00:00
Baligh Uddin
379dca6eb4 am 49242492: (-s ours) am a81e8b66: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '492424924d3bc6573bd353c455458405ddb423f4':
  Import translations. DO NOT MERGE
 2014-07-24 23:35:11 +00:00
Craig Mautner
b33ff85022 am 93853c4c: am b803a2be: Refactor screen blocking logic. 
* commit '93853c4c341ebdc2a630fe76767cbd5d86c8249e':
  Refactor screen blocking logic.
 2014-07-24 23:35:02 +00:00
Alan Viverette
42791ad23b am f3e95f06: am 37a2d88f: Merge "Remove the max ripple count exceeded warning" into lmp-dev 
* commit 'f3e95f06149486ae93e94f8782a22ec0b5f6b510':
  Remove the max ripple count exceeded warning
 2014-07-24 23:34:58 +00:00
Alan Viverette
a937fcbfc8 am 3238f6ff: am d2a2e3bb: Merge "Update icons for search and back" into lmp-dev 
* commit '3238f6ffef186b5d3d57c1a49a8ad9b32b0d27f7':
  Update icons for search and back
 2014-07-24 23:34:54 +00:00
Adam Lesinski
3d4be18bfb am 1038bf1d: am 94499248: Merge "Add <feature-group> tag and change aapt badging" into lmp-dev 
* commit '1038bf1d7a592c74bcc48d729ccea1f56d8fce1d':
  Add <feature-group> tag and change aapt badging
 2014-07-24 23:34:49 +00:00
Prerepa Viswanadham
7b6c0cf06b am 03f305a0: am 6565c129: cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter 
* commit '03f305a0d1a19827f4b8c77a6539b8dbe8ed0457':
  cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
 2014-07-24 23:34:21 +00:00
Svetoslav
bd872fb572 am 56c28a4b: am fc7c8bee: Updated accessibility nodes not properly cached. 
* commit '56c28a4ba468a4c8e9de18f0887b190c0c49282b':
  Updated accessibility nodes not properly cached.
 2014-07-24 23:34:17 +00:00
John Spurlock
6c4c2b15f7 am d3a569a3: am 54a6d07c: Merge "Volume: force-dismiss panel when the screen turns off." into lmp-dev 
* commit 'd3a569a340e7ca4f1f4684eb4f5c1e4a7d2bb259':
  Volume: force-dismiss panel when the screen turns off.
 2014-07-24 23:34:13 +00:00
John Spurlock
2548c2a09f am 4c9c84c5: am 79c0bf24: Merge "QS: Fix clipped battery icon when expanded." into lmp-dev 
* commit '4c9c84c5d92de5aad51f753395343ee73bcd38a0':
  QS: Fix clipped battery icon when expanded.
 2014-07-24 23:34:06 +00:00
Wei Wang
52feb10e01 am fa5f8b4f: am c20ddd45: Merge "Move AdvertiseData length check to BluetoothAdvertiser." into lmp-dev 
* commit 'fa5f8b4ff2d67e8344af8ab6adf0171c613ad307':
  Move AdvertiseData length check to BluetoothAdvertiser.
 2014-07-24 23:33:51 +00:00
Hector Dearman
0cf22691bd am fb8f0643: am aa2a5911: Merge "Update CookieManager API for Council review." into lmp-dev 
* commit 'fb8f0643434630be607abea3ac4e9f7558311b99':
  Update CookieManager API for Council review.
 2014-07-24 23:33:41 +00:00
Chris Craik
e6be6fada5 am 27222820: am 1a146fc8: Compute layer bounds over subset of VertexBuffer verts 
* commit '2722282067f472e30e0642b8374034ac01bca314':
  Compute layer bounds over subset of VertexBuffer verts
 2014-07-24 23:33:37 +00:00
Ruben Brunk
388b642a74 am e5b7dc07: am 70279653: camera2: Move noise model to dynamic metadata. 
* commit 'e5b7dc070163fd4a35d567f98849d43ac93cca2c':
  camera2: Move noise model to dynamic metadata.
 2014-07-24 23:33:33 +00:00
Yorke Lee
b6651515b9 am 5a9a76b5: am 9abe5673: Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev 
* commit '5a9a76b5ba98ee738dc0fbf7632391f54e024c22':
  Add Calls.TRANSCRIPTION to CallLog (2/2)
 2014-07-24 23:33:29 +00:00
ram
494ff9590f am 3b14fe9e: am 487c4b7f: IMS: Adding ims on/off interface files and callback for enabled/disabled features. 
* commit '3b14fe9ee61e61a62dba938a4fbccbde7a4d239f':
  IMS: Adding ims on/off interface files and callback for enabled/disabled features.
 2014-07-24 23:32:35 +00:00
Amit Mahajan
985a272e8e am 929867ba: am 8d569bbf: Merge "Add API invokeOemRilRequestRaw" into lmp-dev 
* commit '929867ba487deb63de862b0fe51077c5beeab063':
  Add API invokeOemRilRequestRaw
 2014-07-24 23:32:29 +00:00
Svetoslav
ca0c744b5c am 695ac3a5: am a6960246: Print to PDF putting a pring job in a wrong state. 
* commit '695ac3a556677caa33b621ddf76532346206d86e':
  Print to PDF putting a pring job in a wrong state.
 2014-07-24 23:32:22 +00:00
Leon Scroggins III
f3662e4c0c am b10d4beb: am 41508fb0: Merge "Document BlurMaskFilter.Blur." into lmp-dev 
* commit 'b10d4beb1fdf61271c9f718ed56d9d6b51077d8c':
  Document BlurMaskFilter.Blur.
 2014-07-24 23:32:18 +00:00
Chris Craik
19393ccd03 am 394e8703: am 2d3c6c93: Connect shadow style attributes to renderer 
* commit '394e8703222d59f0de4da82afce423ada12c346f':
  Connect shadow style attributes to renderer
 2014-07-24 23:32:14 +00:00
Ricardo Cervera
ac53581137 am f6dce8ee: am e974a59f: am 0f1e067a: am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811 
* commit 'f6dce8eeda2889c3bdf78d11c41bbedc7abf8978':
  docs: Fixed RecyclerView example. Bug: 16483811
 2014-07-24 23:31:54 +00:00
Robert Ly
730ca00fd6 am c955cdb3: am 1be71de6: am 39572996: am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs 
* commit 'c955cdb3ba4fef093968c38868edd99b70ea5ab2':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
 2014-07-24 23:31:50 +00:00
Scott Rowe
be9fc8ddd2 am 4d855144: am 1b009123: am 162493b5: am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
* commit '4d8551444dd8d0835f996cd9ff68768a6950aa71':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
 2014-07-24 23:31:46 +00:00
Justin Morey
9c4f83b7bf am 3a005ba0: am 75a72009: Merge "Fix build" into lmp-dev 
* commit '3a005ba07b344b4630c7915a328070b0a2592780':
  Fix build
 2014-07-24 23:31:36 +00:00
Kenny Guy
6f919cd930 am 6bb0818d: am b4900242: Load package information from correct user. 
* commit '6bb0818d811dc0d210b90671cef6315166263150':
  Load package information from correct user.
 2014-07-24 23:31:32 +00:00
Adrian Roos
0051842510 am e626b700: am 29c97b8d: Update KeyguardUserSwitcher to use UserSwitcherController 
* commit 'e626b700da9762e0fd11a401fa724fa4b2de12d3':
  Update KeyguardUserSwitcher to use UserSwitcherController
 2014-07-24 23:31:26 +00:00
Selim Cinek
d06a41d71b am 48f16d6d: am 13476f4d: Implemented new camera affordance 
* commit '48f16d6d49c4446fefaa3b628006c849508e9ea8':
  Implemented new camera affordance
 2014-07-24 23:31:22 +00:00
Justin Morey
9c1bfa980c am c206b06e: am 1d1c13f0: Expose setActiveProfileOwner() using @SystemApi 
* commit 'c206b06eef19f68cc9435d5de0566721aef92a2b':
  Expose setActiveProfileOwner() using @SystemApi
 2014-07-24 23:31:17 +00:00
Adrian Roos
6c964e74b7 am 1787ea77: am 0f53ad6f: Disable trust agents after wrong credential is entered 
* commit '1787ea77745b381c6a1971759f7c62397d90e69f':
  Disable trust agents after wrong credential is entered
 2014-07-24 23:31:04 +00:00
Derek Sollenberger
aadcb5b25a am 1d418b63: am 85c1806b: Refactor text drawing to move minikin interactions outside of the canvas interface. 
* commit '1d418b639b06d591bed4f19d1a75effe225d0ce0':
  Refactor text drawing to move minikin interactions outside of the canvas interface.
 2014-07-24 23:31:00 +00:00
Leon Scroggins III
3eaf9fb221 am e32af264: am 3b88245f: Make updateLocalMatrix replace the current Matrix. 
* commit 'e32af2641687a5a270b5621aaf1717504cb9b61b':
  Make updateLocalMatrix replace the current Matrix.
 2014-07-24 23:30:53 +00:00
Behdad Esfahbod
9fed8eb505 am ed160c28: Merge "Add letter-spacing to Paint and TextView" into lmp-dev 
* commit 'ed160c281f3eda7ccd26e48eed29e2424da5e7ee':
  Add letter-spacing to Paint and TextView
 2014-07-24 23:00:02 +00:00
Prashant Malani
b2abdcb7c2 am 16d220d9: Merge "resolved conflicts for merge of bc3699b1 to lmp-dev" into lmp-dev 
* commit '16d220d9eea3a981a200208476ee863ade6e248d':
  Revert "Remove circular mask"
 2014-07-24 22:46:53 +00:00
Selim Gurun
ab29dfe7c1 am 773433af: Merge "Address API review" into lmp-dev 
* commit '773433af8196217e744752bdcd18be3b632a6f38':
  Address API review
 2014-07-24 22:42:44 +00:00
John Spurlock
183d10b162 am a20b6388: Merge "QS: Handle all camera api exceptions during init." into lmp-dev 
* commit 'a20b63882407656b01062088861071e4a9ebe380':
  QS: Handle all camera api exceptions during init.
 2014-07-24 22:17:54 +00:00
Selim Gurun
c5a1e2c872 Merge "Address API review" into lmp-dev 2014-07-24 22:06:48 +00:00
Selim Gurun
48f6c45069 Address API review 
Bug: 16403458

Address API review. This change updates the FileChooser api. The
largest change is, as requested by API council, providing a helper
to reduce the code app developers need to implement. This
change does not include the CookieManager changes that was requested.

Change-Id: I30d75f36df6bc96d9842b63fdd25c4ff62aee5bb
 2014-07-24 15:18:57 -07:00
John Reck
b06650720e am 7f6c99df: Merge "fix build" into lmp-dev 
* commit '7f6c99df4a1c1829a7bf40d5f19c041db9926b98':
  fix build
 2014-07-24 21:52:52 +00:00
Robert Greenwalt
6482beb588 am 457a09d5: Merge "Fix DUN-based tethering." into lmp-dev 
* commit '457a09d5af90d6e452a9c20606884fd75455ae0c':
  Fix DUN-based tethering.
 2014-07-24 21:52:49 +00:00
Yao Chen
17e20859ec am 5599c63b: Use a sequence number for thumbnail callback. 
* commit '5599c63b69b07990d1a4a25bbad4cf0eed31c146':
  Use a sequence number for thumbnail callback.
 2014-07-24 21:48:04 +00:00