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

209126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daichi Hirono
50d17aa871 Implement queryRoot method of MtpDocumentsProvider. 
BUG=20274999

Change-Id: I27aa8bffe47eab6ea1f4195023dbacb6e2f76548
 2015-07-29 14:38:11 +09:00
Daichi Hirono
d30c9d1302 Remove local flag for proguard. 
Now default configuration of proguard can handle internal VisibleForTesting
annotation. We don't need to have local configuration.

BUG=20274999

Change-Id: Ib21e07336e48dda71d0d2644ddd86422414f7524
 2015-07-28 14:30:07 +09:00
Daichi Hirono
df3f2e6fdd Add ReceiverActivity to MtpDocumentsProvider. 
To show the application chooser for the UsbManager.ACTION_USB_DEVICE_ATTACHED
intent, the intent should be received by activity. The activity has NoDisplay
theme and immediately terminate after routing intent to MtpDocumentsService.

BUG=20274999

Change-Id: I2080ea433b1657dd68640681664adbf92d1d30e9
 2015-07-28 13:06:17 +09:00
Daichi Hirono
ad37061567 Merge "Add MtpDocumentsService." 2015-07-28 03:51:53 +00:00
Daichi Hirono
2efe4cac49 Add MtpDocumentsService. 
BUG=20274999

Change-Id: I1d60ebcf100767136ac7f78e619021776c6be02f
 2015-07-28 12:49:11 +09:00
Selim Cinek
114ef3085e resolved conflicts for merge of f3da5dc7 to master 
Change-Id: I2013f1cb6b258b81f7d415a5e0f7daaa4eb7de80
 2015-07-27 20:31:16 -07:00
Adrian Roos
56de63135f Merge "Fix AccessibilityEventLogger" 2015-07-28 00:58:39 +00:00
destradaa
3b152d9504 Fix NPE in AR hardware binding sequence. 
b/22772433

To keep the old Watcher binding sequence backwards compatible,
it is required to ensure that the callback is only invoked if
the feature is supported by the platform, and an instance is
available.

Change-Id: I0a6335f10647184abdad3ee1583b505160a3308f
 2015-07-27 17:14:03 -07:00
Daniel Estrada Alva
15bb40a58b Merge "Add callback-based support for Hardware Activity Recognition. b/17112184" 2015-07-27 21:41:58 +00:00
Adrian Roos
c7652a8277 Fix AccessibilityEventLogger 
Change-Id: Ie936ccde6b7c93df4c125618ffdc46ce8b7633d8
 2015-07-27 14:28:09 -07:00
Vadim Tryshev
917e5c0fd9 Merge "Fixing non-delivering of DRAG_START event to each view" 2015-07-27 21:21:45 +00:00
Adam Lesinski
deabddb34e am d07d8446: am 62fbfcd9: am d7f4a078: am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 
* commit 'd07d8446dfb9f648a6027a7a35f34781eba51dcc':
  BatteryStats: Prevent BatteryService from blocking
 2015-07-27 21:17:38 +00:00
Adam Lesinski
d07d8446df am 62fbfcd9: am d7f4a078: am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 
* commit '62fbfcd9ee86f8e2ee5d7083a6e9f5857bbbe6d9':
  BatteryStats: Prevent BatteryService from blocking
 2015-07-27 21:03:35 +00:00
Julia Reynolds
4cfa238971 am 98cbe497: am c2c611c4: am 13ad04e7: am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 
* commit '98cbe497f58aaf8ab8bc106d79a3aed567d9b58b':
  Allow Settings to set background data restrict on secondary users.
 2015-07-27 21:03:17 +00:00
George Mount
5e59f002a8 am cd056631: am 24d83c14: am 7739273b: am fa93fbba: am 4ba1820b: Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"" 
* commit 'cd05663186dc232511b98691e454d2f3ef61d0e6':
  Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
 2015-07-27 21:03:10 +00:00
Steve McKay
17012f7613 Merge "Improved files icon and activity label." 2015-07-27 20:56:15 +00:00
Adam Lesinski
62fbfcd9ee am d7f4a078: am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 
* commit 'd7f4a078791c983c89a4ee90b700bd4951627b8e':
  BatteryStats: Prevent BatteryService from blocking
 2015-07-27 20:51:03 +00:00
Jason Monk
10cff12f41 am 39dcae4d: am e63b4ba9: am 75ecaeeb: am e184aabe: am 66179430: Merge "Fix QS switch accessibility problem" into mnc-dev 
* commit '39dcae4d00584b32eab44c6a5655638c55ef5014':
  Fix QS switch accessibility problem
 2015-07-27 20:50:45 +00:00
Svetoslav Ganov
ceb0c2d0bd am 58ef5f1d: am dc63edf4: am 34c1df3a: am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev 
* commit '58ef5f1db5907209faf1890079f6ee607e38427c':
  Pass correct extras to the custom print options activity
 2015-07-27 20:50:38 +00:00
Julia Reynolds
98cbe497f5 am c2c611c4: am 13ad04e7: am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 
* commit 'c2c611c4e5024bc9405cae4c9ffe9d72599f9751':
  Allow Settings to set background data restrict on secondary users.
 2015-07-27 20:49:09 +00:00
George Mount
cd05663186 am 24d83c14: am 7739273b: am fa93fbba: am 4ba1820b: Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"" 
* commit '24d83c1434bd315411c46fb80603ae931000cc82':
  Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
 2015-07-27 20:49:02 +00:00
destradaa
6e2fe75624 Add callback-based support for Hardware Activity Recognition. 
b/17112184

Add a callback-based mechanism for GmsCore to connect to Hardware Activity
Recognition. This allows GmsCore to stop polling to identify if the Android
platform supports the functionality or not.

Change-Id: I8f9459cbd15eecd70f6919c6551e6f7a663c732f
 2015-07-27 13:40:21 -07:00
Julia Reynolds
c2c611c4e5 am 13ad04e7: am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 
* commit '13ad04e76be2fb34ffc9a039272a82636e215caa':
  Allow Settings to set background data restrict on secondary users.
 2015-07-27 20:34:15 +00:00
George Mount
24d83c1434 am 7739273b: am fa93fbba: am 4ba1820b: Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"" 
* commit '7739273bb7eeac531601edfc9091d42bff605a76':
  Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
 2015-07-27 20:34:10 +00:00
Adam Lesinski
d7f4a07879 am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 
* commit '48a90091b1f50043f000929e35d9aae5e8c457e3':
  BatteryStats: Prevent BatteryService from blocking
 2015-07-27 20:33:37 +00:00
Jason Monk
39dcae4d00 am e63b4ba9: am 75ecaeeb: am e184aabe: am 66179430: Merge "Fix QS switch accessibility problem" into mnc-dev 
* commit 'e63b4ba9c8e789315f19f40a7d6447755445200a':
  Fix QS switch accessibility problem
 2015-07-27 20:33:36 +00:00
Svetoslav Ganov
58ef5f1db5 am dc63edf4: am 34c1df3a: am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev 
* commit 'dc63edf43b4b143bc8aa542593175234406630fb':
  Pass correct extras to the custom print options activity
 2015-07-27 20:33:31 +00:00
Jason Monk
e63b4ba9c8 am 75ecaeeb: am e184aabe: am 66179430: Merge "Fix QS switch accessibility problem" into mnc-dev 
* commit '75ecaeeb8650d2ae7b1b4917aedd1777f709cb56':
  Fix QS switch accessibility problem
 2015-07-27 20:21:56 +00:00
Svetoslav Ganov
dc63edf43b am 34c1df3a: am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev 
* commit '34c1df3a154abb8bd495f74f5e53b91e7956e596':
  Pass correct extras to the custom print options activity
 2015-07-27 20:21:48 +00:00
Adam Lesinski
48a90091b1 am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 
* commit 'fc28d6fc9dec30e4cd98cc894d596f7df986f5b9':
  BatteryStats: Prevent BatteryService from blocking
 2015-07-27 20:21:20 +00:00
Jorim Jaggi
16478a8d5c am 7eec4216: am 04f61ee8: am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '7eec421639a6d71f1f5cf1ee066766731d94955b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 20:21:02 +00:00
Julia Reynolds
13ad04e76b am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 
* commit '3df17a6d01507de4690601f948ec776f48ccba87':
  Allow Settings to set background data restrict on secondary users.
 2015-07-27 20:20:41 +00:00
George Mount
7739273bb7 am fa93fbba: am 4ba1820b: Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"" 
* commit 'fa93fbbad465956aea66206b584d0e2f8d269d2c':
  Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
 2015-07-27 20:20:36 +00:00
Jorim Jaggi
7eec421639 am 04f61ee8: am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '04f61ee85da93f2d15034f290faec7512c176d59':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 20:04:14 +00:00
Julia Reynolds
3df17a6d01 am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 
* commit 'f68e0236a67a8d6f8ec167df0daf332221149b51':
  Allow Settings to set background data restrict on secondary users.
 2015-07-27 20:03:28 +00:00
George Mount
fa93fbbad4 am 4ba1820b: Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"" 
* commit '4ba1820b34c215b9f844ccd06373669d9137d27c':
  Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
 2015-07-27 20:03:24 +00:00
Adam Lesinski
fc28d6fc9d Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 2015-07-27 20:01:34 +00:00
Jason Monk
75ecaeeb86 am e184aabe: am 66179430: Merge "Fix QS switch accessibility problem" into mnc-dev 
* commit 'e184aabe42545282c3c9594707c6fa12dbe8fef4':
  Fix QS switch accessibility problem
 2015-07-27 19:59:14 +00:00
Svetoslav Ganov
34c1df3a15 am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev 
* commit '9124c1784d6537827a6b6423f58572395d8fb820':
  Pass correct extras to the custom print options activity
 2015-07-27 19:59:10 +00:00
George Mount
38b74bc9ce am d0162e73: am efbfd2ad: am 02730bab: am da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs" 
* commit 'd0162e730950f92933265bcbc90f5c38105b66ab':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
 2015-07-27 19:52:16 +00:00
Julia Reynolds
f68e0236a6 Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 2015-07-27 19:51:24 +00:00
Jorim Jaggi
04f61ee85d am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit 'f040100cbde4b551dd551a8b0b9eb7194116a95b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:48:37 +00:00
Jason Monk
e184aabe42 am 66179430: Merge "Fix QS switch accessibility problem" into mnc-dev 
* commit '661794307a792690d7608dc81b4e1299937a8f67':
  Fix QS switch accessibility problem
 2015-07-27 19:44:30 +00:00
Svetoslav Ganov
9124c1784d am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev 
* commit '8a54da92ce3da393396bbf0ff86d9525089dcdbf':
  Pass correct extras to the custom print options activity
 2015-07-27 19:44:26 +00:00
George Mount
4ba1820b34 Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"" 
This reverts commit 01fe3f86b1c1e0eb3d8c9ab0b2251233f9164c5d, reversing
changes made to b83b5fa641847ee1d533253ba5e1a3e13913b9d9.

This change is valid for mnc-dev and other mnc branches.
 2015-07-27 12:39:28 -07:00
Jorim Jaggi
f040100cbd am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '6a601960a3cbfbed1f0ac6df65791a3149eec92e':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:35:06 +00:00
George Mount
d0162e7309 am efbfd2ad: am 02730bab: am da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs" 
* commit 'efbfd2ad8bf5f251b938c0f9d91d38a66c333939':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
 2015-07-27 19:31:59 +00:00
Jason Monk
661794307a Merge "Fix QS switch accessibility problem" into mnc-dev 2015-07-27 19:27:29 +00:00
Svetoslav Ganov
8a54da92ce Merge "Pass correct extras to the custom print options activity" into mnc-dev 2015-07-27 19:23:37 +00:00
Jorim Jaggi
6a601960a3 am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '9e49b5d679672ea4a64382f9a36663c73603961b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:18:37 +00:00