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

231947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
3caad43a1f Merge "Preserve TextView mDrawables if it has metadata (ex. tint or padding)" 2016-02-03 22:03:21 +00:00
Vladislav Kaznacheev
383b7aa01b Merge "Make pointer-icon attrs public" 2016-02-03 21:51:48 +00:00
Zach Kuznia
55fd569c1b Merge "Improve gesture recognition state change for TouchExplorer." 2016-02-03 21:48:27 +00:00
Jan Nordqvist
f52a8f6ef7 Fixed API merge issue in master. 
Change-Id: I4bf0104ee703daa4da78d6637c1fa82ace57f073
 2016-02-03 13:01:03 -08:00
Jason Monk
db204e9ada Merge "String updates - touch to tap" 2016-02-03 20:44:28 +00:00
Jason Monk
50b4b1eb39 String updates - touch to tap 
Bug: 26749895
Change-Id: I5a6d44269e48aa89076199a825b65329c735437c
 2016-02-03 15:43:01 -05:00
Zachary Kuznia
28239e8a61 Improve gesture recognition state change for TouchExplorer. 
This increases the tolerace for detecting a user interaction as a
gesture in Touch exploration mode.  The detection should also be more
consistant between devices, as the threshold is based on physical
units.

Change-Id: Iec935e862d2634fba0fea6dc6d81e62ed2213cbc
 2016-02-03 12:06:13 -08:00
Jan Nordqvist
962c6a81e3 Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev 
am: fd600b1113

* commit 'fd600b1113af6f66e28b65f5b53f4a7c751cdef9':
  New System APIs for Passpoint r2 app.
 2016-02-03 20:00:47 +00:00
Jan Nordqvist
fd600b1113 Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev 2016-02-03 19:57:00 +00:00
Chong Zhang
663928862a Merge "Disable WM loggings" 2016-02-03 19:56:50 +00:00
Philip P. Moltmann
92c293609f Merge "Cancel print job if PrintActivity was finished before spooler could be connected." 2016-02-03 19:51:21 +00:00
Chong Zhang
0464a9345e Disable WM loggings 
bug: 26819496
Change-Id: Ib5258391101293c9aaca3b865e1f1580234bcbe3
 2016-02-03 11:47:16 -08:00
Sunny Goyal
40dedd5a97 Merge "Added support for async inflation of RemoteViews" 2016-02-03 19:31:09 +00:00
Vinit Deshpande
a772f0cf34 New System APIs for Passpoint r2 app. 
Change-Id: I09428e9a393999f43aefe5efd77cffe4b1b17da5
 2016-02-03 11:28:21 -08:00
Svetoslav Ganov
d7595b3151 Merge "Add a couple of shared libraries - services, shared" 2016-02-03 19:25:52 +00:00
Rob Carr
48ab53e571 Merge "Remove obsolete conditional preventing surface placement." 2016-02-03 19:25:16 +00:00
Ruben Brunk
574460f547 Merge "Connect VR HAL to VrManagerService." 2016-02-03 19:05:32 +00:00
Chris Tate
eef4cb3efc Merge "fullBackupOnly=true means don't even think about key/value backup" 2016-02-03 18:29:23 +00:00
Chris Tate
220b845ba4 Merge "Send ALARM_CLOCK_CHANGED broadcast with REPLACE_PENDING" 2016-02-03 18:28:33 +00:00
Antonio Cansado
1e3f04f090 Merge "Adding a callback to notify data usage." 2016-02-03 18:16:51 +00:00
Eric Laurent
b09265df23 Merge "Bluetooth: Restrict gain for Absolute volume case" am: 81e7a58754 
am: d24eb54b54

* commit 'd24eb54b5409997ece8e49ce2e57d27f8b41d778':
  Bluetooth: Restrict gain for Absolute volume case
 2016-02-03 18:07:42 +00:00
Eric Laurent
d24eb54b54 Merge "Bluetooth: Restrict gain for Absolute volume case" 
am: 81e7a58754

* commit '81e7a5875465f9b2b7ed785d4f138b11f386c5c1':
  Bluetooth: Restrict gain for Absolute volume case
 2016-02-03 18:02:20 +00:00
Derek Sollenberger
0eef10e556 Merge "Update Canvas API with view system calls." 2016-02-03 17:59:11 +00:00
Geoff Mendal
b3187cc67d Merge "Import translations. DO NOT MERGE" 2016-02-03 17:55:05 +00:00
Geoff Mendal
a59ad81849 Import translations. DO NOT MERGE 
Change-Id: Iad2ccbf1fef7c8ca217e78134a6fa66b738f97f8
Auto-generated-cl: translation import
 2016-02-03 18:53:27 +01:00
Kenny Guy
c5947f8b76 Merge "Match non-crypto aware admins when registering." 2016-02-03 17:45:03 +00:00
Eric Laurent
81e7a58754 Merge "Bluetooth: Restrict gain for Absolute volume case" 2016-02-03 17:30:39 +00:00
Geoff Mendal
5aaac0152f Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 17:18:44 +00:00
Geoff Mendal
ff63640526 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 8152fbd7e9 -s ours 
am: f322b46028  -s ours

* commit 'f322b4602893a9cb3eae30ac0f4f196b3dc95176':
  Import translations. DO NOT MERGE
 2016-02-03 17:17:01 +00:00
Paul Jensen
1a737fbd78 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 17:16:58 +00:00
Ben Kwa
501fde65b5 Merge "Lint fixes and config tweaks." 2016-02-03 17:12:53 +00:00
Paul Jensen
8514a8131f Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev 
am: 44307adcf3

* commit '44307adcf371bacad4de6925a9207bdbfdc6f874':
  Android packet filtering program interpreter test & program generator
 2016-02-03 17:12:47 +00:00
Ben Kwa
e3aee18dc9 Lint fixes and config tweaks. 
- Add recommended ignore properties to lint.xml.
- Make Fragment subclasses public.
- Truncate log tags at 23 chars.
- Fix one instance of passing a color ID instead of a color.
- Misc xml property fixes.

Change-Id: Ie8d6a8932cda72b7a239f6dfab56bd854f909820
 2016-02-03 09:09:40 -08:00
Selim Gurun
061371b3ee Merge "Make abiOverride attribute public" 2016-02-03 17:09:09 +00:00
Paul Jensen
44307adcf3 Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev 2016-02-03 16:48:43 +00:00
Geoff Mendal
f322b46028 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 8152fbd7e9  -s ours

* commit '8152fbd7e999fe57f85944a12b281be47fec0a79':
  Import translations. DO NOT MERGE
 2016-02-03 16:40:38 +00:00
Geoff Mendal
3852b0e888 Import translations. DO NOT MERGE am: a3144a52c6 -s ours am: 1a0c0953a0 -s ours 
am: 04364c7464  -s ours

* commit '04364c74640965e92fb48be2c9ba0f4d75e1f8bf':
  Import translations. DO NOT MERGE
 2016-02-03 16:40:29 +00:00
Florin Malita
7ee59adce5 Merge "Remove remaining references to SkCanvas::SaveFlags" 2016-02-03 16:29:22 +00:00
Geoff Mendal
04364c7464 Import translations. DO NOT MERGE am: a3144a52c6 -s ours 
am: 1a0c0953a0  -s ours

* commit '1a0c0953a0ffebe876e9abcf63d2c3e8e2d12a6f':
  Import translations. DO NOT MERGE
 2016-02-03 15:54:07 +00:00
Florin Malita
777bf85c16 Remove remaining references to SkCanvas::SaveFlags 
One SkCanvas save flag reference snuck back in after the last
cleanup.  Convert to the new SaveFlags enum.

Change-Id: I9ba4b01a19bbb80276c84d30fd0d7b9513892cf9
 2016-02-03 10:48:55 -05:00
Alan Viverette
1c9d20b535 Preserve TextView mDrawables if it has metadata (ex. tint or padding) 
Bug: 26939206
Change-Id: Iccc8b3d50e93e50685d050ca6ea191708a0e6171
 2016-02-03 10:45:55 -05:00
Geoff Mendal
8152fbd7e9 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2016-02-03 15:44:40 +00:00
Geoff Mendal
d6a791fc1f Import translations. DO NOT MERGE 
Change-Id: I801233d391712c477e3b38b912465333b483a78b
Auto-generated-cl: translation import
 2016-02-03 10:42:52 -05:00
Sudheer Shanka
5e8a6e5661 Merge "Add an utility method to get device owner." 2016-02-03 15:31:55 +00:00
Geoff Mendal
1a0c0953a0 Import translations. DO NOT MERGE 
am: a3144a52c6  -s ours

* commit 'a3144a52c63a8f69f0f79fe05070fd181bc70b1d':
  Import translations. DO NOT MERGE
 2016-02-03 15:24:32 +00:00
Paul Jensen
d38fb7662d Android packet filtering program interpreter test & program generator 
Change-Id: I17951bd6320b9eb3b6c43f2ae37f62c2025705c1
 2016-02-03 10:19:13 -05:00
Geoff Mendal
d9eec15d84 Merge "Import translations. DO NOT MERGE" 2016-02-03 14:58:49 +00:00
Geoff Mendal
a3144a52c6 Import translations. DO NOT MERGE 
Change-Id: I3f9c8af09874bbdb5473ffb49a49f21c2d3bc12a
Auto-generated-cl: translation import
 2016-02-03 09:57:33 -05:00
Geoff Mendal
1f7b7aecbd Import translations. DO NOT MERGE 
Change-Id: I423629c9356693e4aa2fa8dfc9d32ff662e1d414
Auto-generated-cl: translation import
 2016-02-03 06:53:26 -08:00
Erik Kline
3d51d8bacc Ignore link properties updates when nothing actually changed. 
am: 6076cb0b85

* commit '6076cb0b859185b075d3a70655afb192d68d0774':
  Ignore link properties updates when nothing actually changed.
 2016-02-03 14:37:11 +00:00