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

208368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve McKay
9c3ef68f8d Merge "Include padding in calculation of column count." 2015-07-23 22:09:59 +00:00
Steve McKay
73610b37de Include padding in calculation of column count. 
Also rename background color and don't sepcify background in grid items.

Change-Id: I4b565604156864384626e75f0bfd41c98623f90a
 2015-07-23 14:47:58 -07:00
Colin Cross
353e6a1b8c am a083ef9a: am bbcc914b: am 01efd7e8: Merge "Use build_number from file" 
* commit 'a083ef9a7b882a249928ed928adf6af61a525e37':
  Use build_number from file
 2015-07-23 19:25:47 +00:00
Colin Cross
a083ef9a7b am bbcc914b: am 01efd7e8: Merge "Use build_number from file" 
* commit 'bbcc914b18a5b2ea57e25e6e79336c5c75d49421':
  Use build_number from file
 2015-07-23 19:11:22 +00:00
Colin Cross
bbcc914b18 am 01efd7e8: Merge "Use build_number from file" 
* commit '01efd7e820edb9677491f28af999d825f21711a4':
  Use build_number from file
 2015-07-23 18:48:22 +00:00
Colin Cross
01efd7e820 Merge "Use build_number from file" 2015-07-23 18:23:06 +00:00
Tim Volodine
08a38b68e9 Merge "Revert "Invoke geolocation permissions callback with denied state by default."" 2015-07-23 17:27:27 +00:00
Tim Volodine
0bb7d2e467 Revert "Invoke geolocation permissions callback with denied state by default." 
This reverts commit 954d1333c478d4dba6c9a0536510da4fd94c0622.

The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046

Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
 2015-07-23 17:16:16 +00:00
Filip Gruszczynski
0867d26270 Merge "Fix NPE when requesting outsets for detached view." 2015-07-23 16:05:48 +00:00
Geoff Mendal
6ec08c8d04 Merge "Import translations. DO NOT MERGE" 2015-07-23 09:51:53 +00:00
Tomasz Mikolajewski
3f78e175ac Add COLUMN_CAPACITY_BYTES column to DocumentsContract. 
Alternatives were considered:
- COLUMN_CAPACITY dounds more like real english sentence, but it is
  inconsistent with consistent with COLUMN_AVAILABLE_BYTES.
- COLUMN_USED_BYTES is consistent with COLUMN_AVAILABLE_BYTES but we rarely
  care about used bytes, more about total capacity. Such information is also
  rarely exposed by backends, and would have to be computed, so misleading.

BUG=None

Change-Id: Ic1ff3eb8fc9ec12cc79ee78c490f361f77cb4706
 2015-07-23 18:06:11 +09:00
Tomasz Mikolajewski
4dc4cb09ce Merge "Add support for efficient move within a document provider." 2015-07-23 08:53:39 +00:00
Geoff Mendal
94b42e14ab Import translations. DO NOT MERGE 
Change-Id: I98fedc0c8bbeb169abb974d0a246fa6413a7eea5
Auto-generated-cl: translation import
 2015-07-23 00:29:38 -07:00
Tomasz Mikolajewski
a375a99884 Add support for efficient move within a document provider. 
Currently moving files even within the same document provider causes
reading and writing all of the bytes, which is very inefficient for all
network based solutions, eg. Drive where moving even huge files can be
instant.

This CL adds an optional moveDocument method to the DocumentProvider as
well as DocumentContract so providers can implement an efficient way of
moving things. If not implemented, we would fallback to moving by
streaming.

BUG=None

Change-Id: I74d6754f96cbafa749a04ca9aebf2e0e2b64b515
 2015-07-23 16:00:05 +09:00
Tomasz Mikolajewski
024fcf7e22 Merge "Add support for efficient copy within a document provider." 2015-07-23 06:07:25 +00:00
Tomasz Mikolajewski
74fe1816e8 Add support for efficient copy within a document provider. 
Currently copying files even within the same document provider causes
reading and writing all of the bytes, which is very inefficient for all
network based solutions, eg. Drive where copying even huge files can be
instant.

This CL adds an optional copyDocument method to the DocumentProvider as
well as DocumentContract so providers can implement an efficient way of
copying things. If not implemented, we would fallback to copying by
streaming.

BUG=None

Change-Id: I8f2b2c0c834717f07d42f8247cd1fc025e82239a
 2015-07-23 13:43:49 +09:00
Steve McKay
3c8afe2011 Merge "Apply hirono@'s logic for disabling delete action" 2015-07-23 01:04:54 +00:00
Steve McKay
709b61de16 Pick column count based on available space. 
Set background color of RecyclerView.

BUG: 22640007
BUG: 22672201
Change-Id: Ic9c65a2a25164698bc08b4620bfa0b067d620f1b
 2015-07-22 17:29:10 -07:00
Filip Gruszczynski
31d300f914 Fix NPE when requesting outsets for detached view. 
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

This is a cherry pick that somehow didn't get through to master.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
 2015-07-22 15:46:06 -07:00
Steve McKay
503648ddc3 Apply hirono@'s logic for disabling delete action 
...when selection contains non-deletable items.

BUG=22441292
Change-Id: I716e5c1f685c9f3d12b01b193753775094cde481
 2015-07-22 12:46:15 -07:00
Steve McKay
3b409d01b9 Push equals impl into SparseBooleanArray. 
Also, implement hashcode, because it is naughty to not.

Change-Id: I2042dac6840cf07027871783a7b6763578fa805d
 2015-07-22 11:53:14 -07:00
Steve McKay
0ab6b0e824 Merge "Update DirectoryFragment to use RecyclerView." 2015-07-22 18:20:33 +00:00
Geoff Mendal
88af84ec52 am 176df282: (-s ours) am 1e06d4c6: (-s ours) am 5c080bd2: (-s ours) am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '176df28256f2657f933235d99cf3247081b02f42':
  Import translations. DO NOT MERGE
 2015-07-22 16:50:50 +00:00
Geoff Mendal
176df28256 am 1e06d4c6: (-s ours) am 5c080bd2: (-s ours) am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '1e06d4c64b6549a73df9d308ae82d7080fd51f37':
  Import translations. DO NOT MERGE
 2015-07-22 16:38:55 +00:00
Geoff Mendal
1e06d4c64b am 5c080bd2: (-s ours) am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5c080bd2fb2d99724e1c0cec11fc1fe9d1cad597':
  Import translations. DO NOT MERGE
 2015-07-22 16:25:34 +00:00
Geoff Mendal
5c080bd2fb am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'c41e3191654d1b1e9df641da6aa7a8bf4f64b975':
  Import translations. DO NOT MERGE
 2015-07-22 16:09:47 +00:00
Geoff Mendal
c41e319165 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 15:56:29 +00:00
Geoff Mendal
fb91daa1c5 Import translations. DO NOT MERGE 
Change-Id: If03e28dba328619399e4f81a01283afbebd7d50d
Auto-generated-cl: translation import
 2015-07-22 10:42:52 -05:00
Geoff Mendal
fd1aee70a3 Merge "Import translations. DO NOT MERGE" 2015-07-22 15:33:01 +00:00
Geoff Mendal
bc59fe20e6 Import translations. DO NOT MERGE 
Change-Id: I4b1315b61e760a3c34cdc91984f01f0199ff63a4
Auto-generated-cl: translation import
 2015-07-22 10:31:21 -05:00
Geoff Mendal
553d3d6f23 am 6722aed8: (-s ours) am 1ac9628c: (-s ours) am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '6722aed82941a9af573d67550dec0db50dffa1d3':
  Import translations. DO NOT MERGE
 2015-07-22 14:45:15 +00:00
Geoff Mendal
5413706963 am 8a17c863: (-s ours) am 5cae0cde: (-s ours) am a88427c3: (-s ours) am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '8a17c86343e215056090cdd7caff977bcd205dc3':
  Import translations. DO NOT MERGE
 2015-07-22 14:45:08 +00:00
Geoff Mendal
c14b17822d am 1ddf059e: (-s ours) am 069bf3c2: (-s ours) am 234bd0f4: (-s ours) am b568f3fd: (-s ours) Import translations. DO NOT MERGE 
* commit '1ddf059e6d5a601e12d75e1cf2913ef24cac2bb8':
  Import translations. DO NOT MERGE
 2015-07-22 14:45:01 +00:00
Geoff Mendal
6722aed829 am 1ac9628c: (-s ours) am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '1ac9628c97a04dacfaaf4ebe5dbcfd6599b0405f':
  Import translations. DO NOT MERGE
 2015-07-22 14:31:50 +00:00
Geoff Mendal
8a17c86343 am 5cae0cde: (-s ours) am a88427c3: (-s ours) am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5cae0cded77f412d738bfdc2e58036c8e9422135':
  Import translations. DO NOT MERGE
 2015-07-22 14:31:45 +00:00
Geoff Mendal
1ddf059e6d am 069bf3c2: (-s ours) am 234bd0f4: (-s ours) am b568f3fd: (-s ours) Import translations. DO NOT MERGE 
* commit '069bf3c2a41a0c97b31602309965f28293b59200':
  Import translations. DO NOT MERGE
 2015-07-22 14:31:40 +00:00
Geoff Mendal
1ac9628c97 am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '8d5ed661f060e3d915f3f1f593f2f87ebd1285cc':
  Import translations. DO NOT MERGE
 2015-07-22 14:19:11 +00:00
Geoff Mendal
5cae0cded7 am a88427c3: (-s ours) am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'a88427c34729368766593fc2a8864b5383e907cc':
  Import translations. DO NOT MERGE
 2015-07-22 14:19:05 +00:00
Geoff Mendal
069bf3c2a4 am 234bd0f4: (-s ours) am b568f3fd: (-s ours) Import translations. DO NOT MERGE 
* commit '234bd0f46c9d75240906fa021b8c4975a34c9c10':
  Import translations. DO NOT MERGE
 2015-07-22 14:19:00 +00:00
Geoff Mendal
8d5ed661f0 am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '920e8be69db7cd24a9c5566b95686a6b714447e9':
  Import translations. DO NOT MERGE
 2015-07-22 14:03:58 +00:00
Geoff Mendal
a88427c347 am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'e573ee63b7a89b121ad36af883c2731d118f4794':
  Import translations. DO NOT MERGE
 2015-07-22 14:03:54 +00:00
Geoff Mendal
234bd0f46c am b568f3fd: (-s ours) Import translations. DO NOT MERGE 
* commit 'b568f3fdc935c9a185b7cf8f462567a6be97b900':
  Import translations. DO NOT MERGE
 2015-07-22 14:03:50 +00:00
Geoff Mendal
920e8be69d Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 13:58:09 +00:00
Geoff Mendal
e292d5b86e Import translations. DO NOT MERGE 
Change-Id: If222f66dff503d3b3f0349d76fd082a6780414d7
Auto-generated-cl: translation import
 2015-07-22 06:53:49 -07:00
Geoff Mendal
e573ee63b7 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 13:51:43 +00:00
Geoff Mendal
7f722ede33 Import translations. DO NOT MERGE 
Change-Id: I064668ffb91d718c0981ecd0f221e5f3b0d364d7
Auto-generated-cl: translation import
 2015-07-22 06:50:26 -07:00
Geoff Mendal
b568f3fdc9 Import translations. DO NOT MERGE 
Change-Id: I51a4605c050aab170712962b4cc2a7df7ca9174d
Auto-generated-cl: translation import
 2015-07-22 06:49:42 -07:00
Yasuhiro Matsuda
f522848259 Merge "Do not broadcast ACTION_AUDIO_BECOMING_NOISY on first boot." 2015-07-22 13:10:47 +00:00
Geoff Mendal
b02c6555b9 Merge "Import translations. DO NOT MERGE" 2015-07-22 12:56:44 +00:00
Geoff Mendal
91d52f6927 Import translations. DO NOT MERGE 
Change-Id: Id242387025c7713edb1bdb14153e1e51e838334c
Auto-generated-cl: translation import
 2015-07-22 05:55:08 -07:00