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

170964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clare Bayley
2bfb88ca6e am fb569013: am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs 
* commit 'fb569013c2b34acb58adc956a12c0f2581028e33':
  Updating screenshots to LMP release and N6
 2014-12-08 19:15:26 +00:00
RoboErik
0713f94493 am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev 
* commit 'e9905bd489cd6fcb75203b97a3a7d60b95329a6a':
  Make setting the session token in MediaBrowserService synchronous
 2014-12-08 19:15:18 +00:00
Dan Sandler
c92c94a5b6 am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 
* commit '2f6d30dfe60826027af9b59d80c536e8f424545d':
  Don't forget to listen for USER_ALL broadcasts.
 2014-12-08 19:15:06 +00:00
Benjamin Franz
f4a76651b0 am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit '5f1ea2e68b138316f2a56d0a1de382ac47f7b11c':
  Change the routing path of bluetooth headset connections.
 2014-12-08 19:14:56 +00:00
Justin Harrison
79e346fe1b am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 
* commit '66351d623acfe67033c605cce4a5d52faab3fb96':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
 2014-12-08 19:14:38 +00:00
Raph Levien
72ebd648b7 am 1a7bac35: am c8640fca: Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev 
* commit '1a7bac35da420bbdf2ed7c2220ad0058abf4d091':
  Add 8 more scripts to the font fallback chain.
 2014-12-08 19:14:32 +00:00
Dongwon Kang
6077acaf14 am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev 
* commit 'bfc9739b1c1d57f388a8be62e99f3592f08ad9b3':
  TIF: handle a race condition when a session is crashed
 2014-12-08 19:14:20 +00:00
Dongwon Kang
46e18c1d41 am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev 
* commit '91d6f185d3c9109ed21956df7d8fd9501ccf1f6c':
  TIF: increase the time threshold for tune operation which was too harsh
 2014-12-08 19:14:14 +00:00
Filip Gruszczynski
5ae61a811a am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev 
* commit 'f5d1cf0b194147fae0aca2c2352b4843627ffc1e':
  Private Window flag to disable touch events in WallpaperService.
 2014-12-08 19:13:39 +00:00
Ricardo Cervera-Navarro
e2c8b5ba1c am 2ca0f49d: am 53966f62: am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs 
* commit '2ca0f49d7e9820699a022135101953313d666d0f':
  Revert "docs: Long press to dismiss fix by Wayne"
 2014-12-08 19:13:33 +00:00
Raph Levien
1918d0276a am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev 
* commit '8aa97d26e48cb86398e3f7df8103379564f16082':
  Change Linkify leniency to VALID
 2014-12-08 19:13:14 +00:00
Nancy Chen
8940955a08 am 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev 
* commit '859fba1def4ed680cfbd189621c1ae557c2cab9a':
  Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)
 2014-12-08 19:13:06 +00:00
Dianne Hackborn
34e7003a78 am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev 
* commit '3cb6496b6c8bb48d458c46e7a062228f0488307d':
  Fix issue #18593636: Turn on "kill important processes that...
 2014-12-08 19:12:47 +00:00
Alan Viverette
5f5e13d07f am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs 
* commit '108e539495edb2bfc0d1a3a2cb0879583561bed6':
  Avoid extra saveLayer calls in RippleDrawable, fix docs
 2014-12-08 19:12:32 +00:00
Svetoslav
f477aeb367 am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched. 
* commit 'ed068f7c3047b3775647a6023c6960a4fc535144':
  Ensure all events from a showing window are dispatched.
 2014-12-08 19:12:22 +00:00
Lajos Molnar
967da505b2 am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev 
* commit '2b6dc199432a574d8655734865b0d75d2140fd8c':
  media: allow full range of Vorbis sampling rates
 2014-12-08 19:12:07 +00:00
Jinsuk Kim
3f771d879c am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev 
* commit 'd1133ba8855199b34c22b369f34c987a14c68b85':
  CEC: Introduce the retry for commands on the new device discovery.
 2014-12-08 19:11:58 +00:00
Dianne Hackborn
7039f6b423 am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev 
* commit '7ca6cc75e32437594bfa53c6f2ca14156c44eb17':
  Add test for isolated services.
 2014-12-08 19:11:51 +00:00
Nick Chalko
b7459df472 am 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev 
* commit '4d1e20a24765711c2767cbab0a7077ca538c838e':
  docs: Fix typo, use --> user
 2014-12-08 19:11:45 +00:00
Chet Haase
0a8cc945ce am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev 
* commit 'b29c6299704ffd3885be6347bf85058010e24868':
  Fix seeking behavior
 2014-12-08 19:11:33 +00:00
Joe Fernandez
29fb654ee9 am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs 
* commit 'f6b890e448e369c506c0ed57a336ce3f6429b940':
  docs: Fixes for App Indexing training class
 2014-12-08 19:10:07 +00:00
Luan Nguyen
4d1b8b6c29 am 37579034: am fded024a: am 0e597e92: am 9b5de582: am daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs 
* commit '37579034a14d6442f0765e45b571a20dbcdcb83e':
  docs: Update MessageAPI notes to mention the unreliable transmission nature.
 2014-12-08 19:09:59 +00:00
smain@google.com
1bef46b9b3 am a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs 
* commit 'a0ce71166198a6ebf337b7e2439a3db79b7d9ad6':
  update L Preview message and disallow crawling /preview
 2014-12-08 19:09:53 +00:00
Zhentao Sun
b97782f2da am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev 
* commit '4f04cb20cc37d7a70c2a50af97cc6fd6d064bb06':
  Fixed a leak in GeofenceHardwareImpl.java.
 2014-12-08 19:09:36 +00:00
John Spurlock
795a514697 Volume: Only play the new vibrate hint once per volume-down. 
Bug: 18666334
Change-Id: Idfa1d0c104bb310548fde533932bffc2b41eafff
 2014-12-08 14:09:35 -05:00
Raph Levien
b9d21d623f am 8de4fb2f: am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev 
* commit '8de4fb2fe53ed7707500d9cdf737953bed3dec7e':
  Fix off-by-one error in computeEllipsis
 2014-12-08 19:09:18 +00:00
Jason Monk
0538e675db am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev 
* commit '85d61aaa1a441efd1c1eba2e30742552fa34a0d6':
  Make CarrierText handle multi-sim
 2014-12-08 19:09:10 +00:00
Joe Fernandez
17ab7f4962 am cdcabe4c: am d6a66d84: am 6ecc6d59: am 88b8b4a5: Merge "docs: studio revision update 1.0" into lmp-docs 
* commit 'cdcabe4cd6510e1009c01f5266da74b0ae1f1b32':
  docs: studio revision update 1.0
 2014-12-08 19:07:20 +00:00
Rich Slogar
53202d0129 am 1dfaa3a0: am 78264a4d: am 0039a73b: am b7ef7fcd: Merge "docs: skd tools revision 24.0.0" into lmp-docs 
* commit '1dfaa3a02b5b377a3dacdd97e24b8559dc1aae6c':
  docs: skd tools revision 24.0.0
 2014-12-08 19:07:08 +00:00
Joe Fernandez
cdcabe4cd6 am d6a66d84: am 6ecc6d59: am 88b8b4a5: Merge "docs: studio revision update 1.0" into lmp-docs 
* commit 'd6a66d841eef4fb983cc539c4ca050060ecf066c':
  docs: studio revision update 1.0
 2014-12-08 18:59:34 +00:00
Rich Slogar
1dfaa3a02b am 78264a4d: am 0039a73b: am b7ef7fcd: Merge "docs: skd tools revision 24.0.0" into lmp-docs 
* commit '78264a4dbc4d48ee149e5706aa8d9f25cc359b20':
  docs: skd tools revision 24.0.0
 2014-12-08 18:59:29 +00:00
Joe Fernandez
d6a66d841e am 6ecc6d59: am 88b8b4a5: Merge "docs: studio revision update 1.0" into lmp-docs 
* commit '6ecc6d59f37e80137069e548e5be5db30df52909':
  docs: studio revision update 1.0
 2014-12-08 18:51:39 +00:00
Rich Slogar
78264a4dbc am 0039a73b: am b7ef7fcd: Merge "docs: skd tools revision 24.0.0" into lmp-docs 
* commit '0039a73bb661d1359dd72253b527990e293f956c':
  docs: skd tools revision 24.0.0
 2014-12-08 18:51:35 +00:00
Alan Viverette
e615da7eb7 am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev 
* commit 'f1792c4219fb341a59c4b90c0ce5dd6e0e7b87f0':
  Fix hotspot coordinate propagation in ViewGroup and AbsListView
 2014-12-08 18:47:46 +00:00
Joe Fernandez
6ecc6d59f3 am 88b8b4a5: Merge "docs: studio revision update 1.0" into lmp-docs 
* commit '88b8b4a5d07ada880698a0130e607ea65bf2c044':
  docs: studio revision update 1.0
 2014-12-08 18:44:09 +00:00
Rich Slogar
0039a73bb6 am b7ef7fcd: Merge "docs: skd tools revision 24.0.0" into lmp-docs 
* commit 'b7ef7fcd40a9e18fed3c0e8c63f454c44ae2453f':
  docs: skd tools revision 24.0.0
 2014-12-08 18:44:05 +00:00
Joe Fernandez
88b8b4a5d0 Merge "docs: studio revision update 1.0" into lmp-docs 2014-12-08 18:41:11 +00:00
Alan Viverette
f1792c4219 Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev 2014-12-08 18:39:56 +00:00
Rich Slogar
3c2508ccbc docs: studio revision update 1.0 
Change-Id: I5d6dc9fc029e45df143fbceba846978d15a6bc4d
 2014-12-08 10:38:28 -08:00
Alan Viverette
b942b6f15c Fix hotspot coordinate propagation in ViewGroup and AbsListView 
There was a weird disconnect between setPressed() and hotspot propagation
behavior. This makes hotspot propagation work like setPressed(). Also
fixes ripple animation during drag-to-open.

BUG: 18631557
BUG: 18593243
Change-Id: Id4adf5d815e4d426b4182aac4d0c780f04472ae4
 2014-12-08 10:37:39 -08:00
Rich Slogar
b7ef7fcd40 Merge "docs: skd tools revision 24.0.0" into lmp-docs 2014-12-08 18:35:42 +00:00
Winson Chung
87024f7335 am 16158852: Merge "Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)" into lmp-mr1-dev 
* commit '16158852e2d91041df6d3c031cefe4b77f0583aa':
  Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)
 2014-12-08 18:35:11 +00:00
Winson Chung
16158852e2 Merge "Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)" into lmp-mr1-dev 2014-12-08 18:30:41 +00:00
smain@google.com
54403cf8eb am 97afbe1e: am 39519067: am a4924046: am d48168bd: add survey link 
* commit '97afbe1e875b0ba5f5394b924a4d0d38e051c40c':
  add survey link
 2014-12-08 18:23:23 +00:00
smain@google.com
97afbe1e87 am 39519067: am a4924046: am d48168bd: add survey link 
* commit '395190677efb61863de82ba6ce4eeb42311dfe7a':
  add survey link
 2014-12-08 18:16:01 +00:00
smain@google.com
395190677e am a4924046: am d48168bd: add survey link 
* commit 'a4924046b936a5821b90dcbd7a4bd06447430749':
  add survey link
 2014-12-08 18:10:16 +00:00
Geoff Mendal
d7be88dc71 am 878b49dc: (-s ours) am 31a23f3b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '878b49dc707961d8797ab750e78d3fb2bb048152':
  Import translations. DO NOT MERGE
 2014-12-08 18:04:07 +00:00
Jeff Sharkey
5b41696c56 am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
* commit 'a8fb580379b83b7fc76ee5b99149bbc8a2ce44ab':
  Offer to "merge" subscribers for data usage.
 2014-12-08 18:04:02 +00:00
Alan Viverette
3891784f30 am 3ad41537: Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev 
* commit '3ad41537100e54d35d48f677eaae7f10934f3a15':
  Adjust edit text layout, ripple alphas to be closer to Material spec
 2014-12-08 18:03:54 +00:00
smain@google.com
a4924046b9 am d48168bd: add survey link 
* commit 'd48168bd780f67a9c4a3714d0f551b1f60774d17':
  add survey link
 2014-12-08 18:02:12 +00:00