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

216645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Kwa
284e1dbf32 Merge "Switch DocumentsUI over to use AppCompat themes." 2015-08-31 18:46:07 +00:00
Ben Kwa
a747d2e223 Switch DocumentsUI over to use AppCompat themes. 
Switches from Material to AppCompat themes in order to start using
Snackbar.

Also, factor the common bits out of DocumentsNonDialogTheme and
FilesTheme, and make the theme names clearer.

BUG=23518578

Change-Id: I94a00e910469c57315823ae9df33024f2c7360ee
 2015-08-31 11:43:46 -07:00
Todd Kennedy
ecf9b05812 Merge "Tweak systrace calls" 2015-08-31 17:58:23 +00:00
Alan Viverette
8e88b37833 Merge "Implement missing jumpToCurrentState() in LayerDrawable" 2015-08-31 16:43:28 +00:00
Daniel Estrada Alva
4d25f52ae1 Merge "Clean up Gps/Flp Hardware on shut-down." 2015-08-31 16:42:14 +00:00
Alan Viverette
9151a69951 Implement missing jumpToCurrentState() in LayerDrawable 
Bug: 23674536
Change-Id: Icf1a4248d82484e48a958ce019b1f9cb0caeac9e
 2015-08-31 12:39:27 -04:00
Geoff Mendal
e171a1cd3a Merge "Import translations. DO NOT MERGE" 2015-08-31 16:06:06 +00:00
Geoff Mendal
9bd253a913 Import translations. DO NOT MERGE 
Change-Id: I92853b63a9260a7faf64a8b2bd19c9390318f864
Auto-generated-cl: translation import
 2015-08-31 11:03:15 -05:00
Alan Viverette
c725e8d5ea Add missing @param in ResourceManager, set InflateException source 
Bug: 11695070
Change-Id: I94a4980688a952c1f59f1cb15cf2192e3c51de90
 2015-08-31 11:36:16 -04:00
Geoff Mendal
d69bb61093 Merge "Import translations. DO NOT MERGE" 2015-08-31 12:44:20 +00:00
Geoff Mendal
1c85ac66c0 Import translations. DO NOT MERGE 
Change-Id: I6c5aed9a246676b5b0c3c636f7ef034da7d1de01
Auto-generated-cl: translation import
 2015-08-31 05:43:06 -07:00
Geoff Mendal
349ef86704 Import translations. DO NOT MERGE 
Change-Id: I7cab335626c677ed5dca5571a042a811a8f6811c
Auto-generated-cl: translation import
 2015-08-31 05:32:09 -07:00
Tomasz Mikolajewski
3d13bdfd36 Merge "Fix remaining renames in MtpDocumentsProvider tests." 2015-08-31 04:34:44 +00:00
Daichi Hirono
2e95181a7a Merge "Add simple unit test for MtpManager which uses real MTP device." 2015-08-31 04:31:17 +00:00
Tomasz Mikolajewski
3edb420137 Fix remaining renames in MtpDocumentsProvider tests. 
Change-Id: I7093654c35faa750c12f75da57ddfa2828c474b0
 2015-08-31 13:25:59 +09:00
Daichi Hirono
5bc41d1854 Add simple unit test for MtpManager which uses real MTP device. 
BUG=23536467

Change-Id: I46f207b09d3d0706ccf8cb02d8dedcf6eb354a89
 2015-08-31 13:20:23 +09:00
Daichi Hirono
c68b9df81e Merge "Fix member naming style in PipeManagerTest." 2015-08-31 03:36:23 +00:00
Daichi Hirono
84dfb05407 Fix member naming style in PipeManagerTest. 
BUG=None

Change-Id: I962a37667f110ee17e62e24517db6a85aa227b9f
 2015-08-31 12:32:39 +09:00
Daichi Hirono
03a0965933 Merge "Add activity to show the result of tests." 2015-08-31 03:31:08 +00:00
Daichi Hirono
c3e93a8f5b Add activity to show the result of tests. 
When testing a real MTP device, we cannot obtain test results by using the USB
port because the USB port is occupied by the MTP devcie. The CL adds an activity
to test package that shows test results.

BUG=23536467

Change-Id: I0e53c2de122cb3afd52f22bedd93ece53aaeb525
 2015-08-31 12:29:04 +09:00
Pavel Zhamaitsiak
e9acfd59b8 am 07d04774: am 59f3c342: am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev 
* commit '07d04774dac30bf11523de1f4bea710ce276c207':
  Support uneditable enhanced 4g lte mode config
 2015-08-29 23:19:03 +00:00
Geoff Mendal
d80176ce73 am 67953778: (-s ours) am 999576d0: (-s ours) am 8038391a: (-s ours) am 469fa946: (-s ours) Import translations. DO NOT MERGE 
* commit '67953778546ab2ac3dfbc4aa61b236895fd1ac2b':
  Import translations. DO NOT MERGE
 2015-08-29 23:18:56 +00:00
Pavel Zhamaitsiak
07d04774da am 59f3c342: am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev 
* commit '59f3c3429bf61ff4eb6f5d16abba01cb58cc5ee9':
  Support uneditable enhanced 4g lte mode config
 2015-08-29 23:09:57 +00:00
Geoff Mendal
6795377854 am 999576d0: (-s ours) am 8038391a: (-s ours) am 469fa946: (-s ours) Import translations. DO NOT MERGE 
* commit '999576d050376f6b3e78827f9a0353b376ace1e4':
  Import translations. DO NOT MERGE
 2015-08-29 23:09:51 +00:00
Pavel Zhamaitsiak
59f3c3429b am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev 
* commit '6611cff402f0edeff85e7a9e6fedc6eeb8f8b1f1':
  Support uneditable enhanced 4g lte mode config
 2015-08-29 22:57:34 +00:00
Geoff Mendal
999576d050 am 8038391a: (-s ours) am 469fa946: (-s ours) Import translations. DO NOT MERGE 
* commit '8038391a0841f6a038a9dd3592675e794678835b':
  Import translations. DO NOT MERGE
 2015-08-29 22:57:29 +00:00
Pavel Zhamaitsiak
6611cff402 am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev 
* commit 'd9efca994f99523288986f29128d696440ee4150':
  Support uneditable enhanced 4g lte mode config
 2015-08-29 22:44:41 +00:00
Geoff Mendal
8038391a08 am 469fa946: (-s ours) Import translations. DO NOT MERGE 
* commit '469fa946132b34165ea014e2eef7cd94f59171c1':
  Import translations. DO NOT MERGE
 2015-08-29 22:44:37 +00:00
Geoff Mendal
438b117473 Merge "Import translations. DO NOT MERGE" 2015-08-29 19:32:04 +00:00
Geoff Mendal
5162988969 Import translations. DO NOT MERGE 
Change-Id: Ie00c5897e901dbc7b983779e9f98646f3dff09bc
Auto-generated-cl: translation import
 2015-08-29 10:57:24 -07:00
Pavel Zhamaitsiak
d9efca994f Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev 2015-08-29 15:40:05 +00:00
Geoff Mendal
469fa94613 Import translations. DO NOT MERGE 
Change-Id: I770ccd06cea0e57fa92434a33e4e183d79010921
Auto-generated-cl: translation import
 2015-08-29 08:37:22 -07:00
Geoff Mendal
29dd07b269 Merge "Import translations. DO NOT MERGE" 2015-08-29 14:34:15 +00:00
Geoff Mendal
c12a2ed7fe Import translations. DO NOT MERGE 
Change-Id: Ibaa344fa8a1adf5fb4cebc6435188a45e6d69fa1
Auto-generated-cl: translation import
 2015-08-29 07:32:13 -07:00
Geoff Mendal
8067dfef2e Merge "Import translations. DO NOT MERGE" 2015-08-29 14:21:08 +00:00
Geoff Mendal
72285bcccf Import translations. DO NOT MERGE 
Change-Id: I2446db9d1ecc2efedeb811dc2d72b994241f0acf
Auto-generated-cl: translation import
 2015-08-29 07:14:27 -07:00
Geoff Mendal
93f5ad8991 Import translations. DO NOT MERGE 
Change-Id: Ia1726fc0d4f959503a4e904b4cd493f6b2a11d9f
Auto-generated-cl: translation import
 2015-08-29 06:48:39 -07:00
Jim Miller
20a17f4a1f am fe17d791: am 098cb247: am 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 
* commit 'fe17d79173e753b6b2752c1a806a6f97a59f35b8':
  Run callbacks from fingerprintd through handler.
 2015-08-29 01:54:10 +00:00
Jim Miller
fe17d79173 am 098cb247: am 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 
* commit '098cb2470fa8f13bb3da6267dd33495391b508cc':
  Run callbacks from fingerprintd through handler.
 2015-08-29 01:46:48 +00:00
Jim Miller
098cb2470f am 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 
* commit '3396a11e354fe4d6243749579c976b341d1007a0':
  Run callbacks from fingerprintd through handler.
 2015-08-29 01:37:41 +00:00
Ian Pedowitz
c3008a698b am 80bed748: am 2e80aa73: am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev 
* commit '80bed748170b24f57d6a2db92b00c6be34e8f36a':
  Show the ResolverActivity in dock mode
 2015-08-29 01:34:32 +00:00
Deepanshu Gupta
45b50acf61 am 4845fa72: am b8ae1879: Merge "Fix android:theme parsing for custom views." into mnc-ub-dev 
* commit '4845fa72c236f7c70572a9ae24a8e183edfd485f':
  Fix android:theme parsing for custom views.
 2015-08-29 01:28:06 +00:00
Christopher Wiley
c328c02888 am 6dea7ba0: (-s ours) am 4f8653c3: (-s ours) am 3fc6f441: (-s ours) Merge "Do not merge namespaces" 
* commit '6dea7ba05c4f2452c90e05da1761090973c8e6b5':
  Do not merge namespaces
 2015-08-29 01:27:57 +00:00
Jim Miller
3396a11e35 am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 
* commit '3656975ef879175aa81cf6362a6a7ffc4a5a99fc':
  Run callbacks from fingerprintd through handler.
 2015-08-29 01:26:21 +00:00
Jim Miller
3656975ef8 Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev 2015-08-29 01:14:45 +00:00
Jim Miller
8b3c25a34a Run callbacks from fingerprintd through handler. 
This fixes a potential race condition on the client monitors
where an async event from fingerprintd could change the state
and disrupt communication with the clients.

Fixes bug 23633702

Change-Id: I69635ab768f1e8abefd0b0d8b8e73bb81e7b5695
 2015-08-29 01:12:46 +00:00
Ian Pedowitz
80bed74817 am 2e80aa73: am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev 
* commit '2e80aa7302611b698897129c379907b18da89b91':
  Show the ResolverActivity in dock mode
 2015-08-29 00:57:55 +00:00
Ian Pedowitz
2e80aa7302 am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev 
* commit '6f75cb1476c1e59a255078468aa586b6fca32ee8':
  Show the ResolverActivity in dock mode
 2015-08-29 00:52:10 +00:00
Ian Pedowitz
6f75cb1476 am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev 
* commit '8d027e6d523d13a9cf2a5cf4ef901cc3e78b901d':
  Show the ResolverActivity in dock mode
 2015-08-29 00:40:19 +00:00
Sungmin Choi
8d2826bee2 Support uneditable enhanced 4g lte mode config 
Bug: 23539759
Change-Id: I069d994eaef2f57c3d01ff2f36abcd274da431a5
 2015-08-29 00:38:56 +00:00