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

185933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrei Kapishnikov
35e71f57b4 Framework: Introduced new NFC provisioning mime-type application/com.android.managedprovisioning.v2 
Related CL: https://googleplex-android-review.git.corp.google.com/657588
Bug: 19673809

Change-Id: I292f9a5b5c511c9102fb43fe938b0389af7fbc54
 2015-03-25 11:12:01 -04:00
Jason Monk
a91e9e5403 am a644c01d: (-s ours) am 4c1a49fc: am 039013c2: Merge "Sort Bluetooth devices in quick settings by name" 
* commit 'a644c01db212601c478f46f6914536fadc6cf8f7':
  Sort Bluetooth devices in quick settings by name
 2015-03-25 14:41:13 +00:00
Jason Monk
a644c01db2 am 4c1a49fc: am 039013c2: Merge "Sort Bluetooth devices in quick settings by name" 
* commit '4c1a49fc53a6e9caacfb6d6a8c4c114c2b9a61a9':
  Sort Bluetooth devices in quick settings by name
 2015-03-25 14:31:55 +00:00
Derek Sollenberger
240d52cb96 Merge "Fix DrawFilter's usage in HWUI." 2015-03-25 14:30:51 +00:00
Geoff Mendal
9619884525 Merge "Import translations. DO NOT MERGE" 2015-03-25 14:26:25 +00:00
Jason Monk
4c1a49fc53 am 039013c2: Merge "Sort Bluetooth devices in quick settings by name" 
* commit '039013c28ef634ab1b630292cc38fb57f206dffd':
  Sort Bluetooth devices in quick settings by name
 2015-03-25 14:25:10 +00:00
Geoff Mendal
49121d617e Import translations. DO NOT MERGE 
Change-Id: I7f63dc025e1869ee26115aeb6b90cf17f2a1ccfd
Auto-generated-cl: translation import
 2015-03-25 07:24:18 -07:00
Jason Monk
039013c28e Merge "Sort Bluetooth devices in quick settings by name" 2015-03-25 14:12:13 +00:00
Derek Sollenberger
0b8606266c Fix DrawFilter's usage in HWUI. 
Also add additional compile time checks to ensure that the Java
and Skia APIs remain in sync.

bug:19890753
Change-Id: I8503cacf2859307e3f480a78603f9f05901b58cc
 2015-03-25 10:08:30 -04:00
Gus Prevas
4e2541c543 am 60b0846f: am c4d7fc10: am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev 
* commit '60b0846fc2be8ba462bcfa535cbaced6c43e532b':
  Changes callback to a WeakReference in ActivityContainerCallback.
 2015-03-25 13:16:26 +00:00
Geoff Mendal
777b2e3d8f Merge "Import translations. DO NOT MERGE" 2015-03-25 13:09:25 +00:00
Gus Prevas
60b0846fc2 am c4d7fc10: am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev 
* commit 'c4d7fc10211e9f08317c94e64ac57447e04af428':
  Changes callback to a WeakReference in ActivityContainerCallback.
 2015-03-25 13:08:39 +00:00
Gus Prevas
c4d7fc1021 am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev 
* commit '568356ff9a1deab794d329f8c2e245f5a564a2f3':
  Changes callback to a WeakReference in ActivityContainerCallback.
 2015-03-25 13:02:46 +00:00
Geoff Mendal
afec5f2245 Import translations. DO NOT MERGE 
Change-Id: I68596d1af3807e0de2cbba9ebd0e65deda354fa9
Auto-generated-cl: translation import
 2015-03-25 05:57:17 -07:00
Geoff Mendal
a613a52069 Merge "Import translations. DO NOT MERGE" 2015-03-25 12:56:23 +00:00
Gus Prevas
568356ff9a Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev 2015-03-25 12:55:37 +00:00
Geoff Mendal
71bed8db2e Import translations. DO NOT MERGE 
Change-Id: I9f8461cc3c0002086052c65ba0c1ac801198c042
Auto-generated-cl: translation import
 2015-03-25 05:44:52 -07:00
Geoff Mendal
216bef6c35 Import translations. DO NOT MERGE 
Change-Id: I9d36d679d32ee84e90eec1d51515894c36390bc1
Auto-generated-cl: translation import
 2015-03-25 05:41:29 -07:00
Florian Salbrechter
084da9b14e Fixed wrong documentation for BLUETOOTH_SERVICE. 
The documentation was incorrectly stating that getSystemService() would
return a BluetoothAdater for Context.BLUETOOTH_SERVICE. The actual
return type is BluetoothManager.
 2015-03-25 11:00:55 +00:00
Flavio Lerda
468cca0236 Merge "Fix command for getting signing key fingerprint." 2015-03-25 10:15:56 +00:00
Ryo Hashimoto
ad32b4de5f Merge "Add BugreportStorageProvider" 2015-03-25 05:22:23 +00:00
Youngsang Cho
94615e49e1 Merge "Make TvInputService skip to dispatch media keys to an overlay view" 2015-03-25 04:47:30 +00:00
Youngsang Cho
53aa5744c9 Make TvInputService skip to dispatch media keys to an overlay view 
If media keys are dispatched to an overlay view, it is always consumed
because of fallback logic. Therefore, TvInputService skips to dispatch
media keys to an overlay view in order to return the keys back to
an application.

Bug: 18195249
Change-Id: I1cb4c9de5a73bd741ab64b1b85e9c986a1a92a90
 2015-03-25 13:44:04 +09:00
Jinsuk Kim
1f5fd58741 Merge "CEC: Explicitly turn on screen for remote control passthrough" 2015-03-25 04:34:23 +00:00
Svet Ganov
3784a45225 Merge "First implementation of the grant/revoke UI" 2015-03-25 03:16:40 +00:00
Svet Ganov
3695b8a148 First implementation of the grant/revoke UI 
Change-Id: Icdb7c822881552b30850697dba709671bf27baa5
 2015-03-24 20:15:43 -07:00
Adam Powell
16e30f5e5f Merge "Fix right click to context menu behavior of View." 2015-03-25 02:26:26 +00:00
John Spurlock
7ff7cdcd0e Merge "Fix typo in KeyguardUpdateMonitor." 2015-03-25 01:41:19 +00:00
John Spurlock
36a1342bce Fix typo in KeyguardUpdateMonitor. 
Change-Id: Iedb2b2051b1a14ab7cc099614f45a57b745ea19d
 2015-03-24 21:15:48 -04:00
Rubin Xu
6fd1705fbc Merge "Fix doc for package checksum in DevicePolicyManager." 2015-03-25 00:41:52 +00:00
Deepanshu Gupta
ab11ec3917 am e773c20d: am 693236b3: am c263a07a: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'e773c20d43a4a8b7504a91df5dd7cb216b89eaef':
  Update JRE for runConfigurations.
 2015-03-25 00:30:05 +00:00
Deepanshu Gupta
dfac5b9141 am 73a92bd7: (-s ours) am 83ba89e9: am 3deade59: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '73a92bd7d12c257735ccfd8bb763f7b3fdbab834':
  Fix project settings. [DO NOT MERGE]
 2015-03-25 00:29:57 +00:00
Deepanshu Gupta
3ae0bc032a am e2b85016: am ce2b74f7: am e51f5cdc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e2b8501695c4ba5712d49313e86a566e95a5b0df':
  Fix RoundRect radius.
 2015-03-25 00:29:50 +00:00
Deepanshu Gupta
cb580742e3 am 659413d6: am 5c03cd8a: am 96a67430: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '659413d6a2ccd8c8ade06bc3420ca90def3e3be6':
  Use right colors for status bar and nav bar.
 2015-03-25 00:29:42 +00:00
Deepanshu Gupta
88c2fdc00c am eb96b231: am 25557e0a: am 5f0252de: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit 'eb96b231b2755d50db4f931cc11203fd32a90820':
  Better shadows.
 2015-03-25 00:29:34 +00:00
Deepanshu Gupta
5eda5a3d22 am f0e713a6: am 01f9ad1c: am 2ceb310d: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit 'f0e713a67a0b5ea5f146900b3d4e53f6e1481c49':
  Fix layoutlib tests.
 2015-03-25 00:29:23 +00:00
Jun Mukai
33e3036a38 Fix right click to context menu behavior of View. 
When the View opens the context menu, the mouse-down event is
already handled. Therefore, the next ACTION_UP should be canceled,
otherwise, single right click shows the context menu and then
invokes the normal click actions.

Also, the right-down event should always be consumed regardless
of the context menu support. "the right click opens the context
menu on some views, but it behaves as a normal click on some
other views" would confuse users.

Bug: 19641497
Change-Id: Ibbc18fe641745cf42382129b81858d8f3d14768b
 2015-03-24 17:24:10 -07:00
Deepanshu Gupta
e773c20d43 am 693236b3: am c263a07a: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit '693236b367050f40b02ab22991d30eb260ec53ea':
  Update JRE for runConfigurations.
 2015-03-25 00:22:57 +00:00
Deepanshu Gupta
73a92bd7d1 am 83ba89e9: am 3deade59: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '83ba89e94a0ae81875d62666cc67e9f5a357d7ea':
  Fix project settings. [DO NOT MERGE]
 2015-03-25 00:22:54 +00:00
Deepanshu Gupta
e2b8501695 am ce2b74f7: am e51f5cdc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'ce2b74f729ea79b86a69cd3f8dd505aa93d0025b':
  Fix RoundRect radius.
 2015-03-25 00:22:50 +00:00
Deepanshu Gupta
659413d6a2 am 5c03cd8a: am 96a67430: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '5c03cd8aadcfbf118405bfa5fb2fb95b5561da04':
  Use right colors for status bar and nav bar.
 2015-03-25 00:22:46 +00:00
Deepanshu Gupta
eb96b231b2 am 25557e0a: am 5f0252de: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '25557e0a96c3987c35405fbec56c561ceeb6daf0':
  Better shadows.
 2015-03-25 00:22:41 +00:00
Deepanshu Gupta
f0e713a67a am 01f9ad1c: am 2ceb310d: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '01f9ad1c671f0b14554ce6ccec10f34e86a49a2a':
  Fix layoutlib tests.
 2015-03-25 00:22:37 +00:00
Deepanshu Gupta
693236b367 am c263a07a: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'c263a07a55a9806147304a1420ceec2d27a6b49d':
  Update JRE for runConfigurations.
 2015-03-25 00:15:44 +00:00
Deepanshu Gupta
83ba89e94a am 3deade59: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '3deade5981372fc44e83c161c7d0dbb9df529e3f':
  Fix project settings. [DO NOT MERGE]
 2015-03-25 00:15:39 +00:00
Deepanshu Gupta
ce2b74f729 am e51f5cdc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e51f5cdcf34fe127792a177a3953dad03ef23647':
  Fix RoundRect radius.
 2015-03-25 00:15:33 +00:00
Deepanshu Gupta
5c03cd8aad am 96a67430: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '96a67430c0088168f21b230c64c348a53e672538':
  Use right colors for status bar and nav bar.
 2015-03-25 00:15:28 +00:00
Deepanshu Gupta
25557e0a96 am 5f0252de: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '5f0252dee43a1cd0f1591b3c9bea2d47ad1f3df0':
  Better shadows.
 2015-03-25 00:15:22 +00:00
Deepanshu Gupta
01f9ad1c67 am 2ceb310d: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '2ceb310d09a865c56145ba8b5d643a11a7ad2ce5':
  Fix layoutlib tests.
 2015-03-25 00:15:14 +00:00
Deepanshu Gupta
c263a07a55 am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit '862f5900e8abce1cc20979a4dca76e1f0b982880':
  Update JRE for runConfigurations.
 2015-03-25 00:09:01 +00:00