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

2165 Commits

Author SHA1 Message Date
Bill Yi
4f7761324c Import translations. DO NOT MERGE 
Change-Id: I9d35beab3bc8bc82ee9eb3ce5ddfd1f08f55f9cd
Auto-generated-cl: translation import
 2016-06-09 04:03:54 -07:00
Ben Lin
a433c6dc4d Isolate Menu/Action management into dedicated manager classes. 
We are now also returning fragmentTuner at the activity level, so that
directoryFragment does not have to do a .pick() logic depending on the
activity type. Rather, the logic lies within the activity itself.

Bug: 24416336
Change-Id: Idb200864f6c9468b9193781f6ac505b557ffbce9
(cherry picked from commit bc330a4bf53c3a766292097d1815b9abd469a945)
 2016-06-08 22:45:42 +00:00
Steve McKay
b25f587933 Preserve selection in memory during rotation. 
Using onRetainNonConfigurationInstance
Eliminate 1k limit on selections.
Bug: 28194201

Failed cherrypick merge from https://googleplex-android-review.git.corp.google.com/#/c/1105581/

Change-Id: Id986c23867df33f1e53bb2999ba51babde5d535b
 2016-06-08 13:14:45 -07:00
TreeHugger Robot
641517546c Merge "Recycle after return to avoid returning an invalid value." 2016-06-08 02:43:55 +00:00
Baligh Uddin
471718a57f Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Icab456e7a193fc6099bbd6e7ff207d542e98830e
 2016-06-07 17:16:36 -07:00
Garfield, Tan
866858b85a Recycle after return to avoid returning an invalid value. 
Also add some main thread assertions.

Change-Id: Id6314d6e92d530ce57a01902b5570381fa20044d
(cherry picked from commit 1a1b9148a2094b4365ff5e65372b1a1eb0282a0a)
 2016-06-07 23:30:39 +00:00
Garfield, Tan
3c2bf54e30 Use pool for MotionInputEvents. 
Bug: 28987543
Change-Id: I3128320a7d527fdd74ab80165b270be2e5e34476
(cherry picked from commit 2458a15aadca7902744cd7c5f3da8e0779e1e3b8)
 2016-06-07 23:30:22 +00:00
TreeHugger Robot
546d5b10a1 Merge "Converge toList and getAll methods." 2016-06-07 21:36:27 +00:00
Steve McKay
f347eef4c7 Converge toList and getAll methods. 
Change-Id: I71ba53947f1840a21a9b1f77523dce8675308c99
 2016-06-07 12:26:59 -07:00
TreeHugger Robot
3c006b4936 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:28:43 +00:00
Bill Yi
cf3f08d4e8 Import translations. DO NOT MERGE 
Change-Id: I98171b651d3e690b0439bb2d205ca615d191c7bd
Auto-generated-cl: translation import
 2016-06-06 13:49:28 -07:00
Guang Zhu
dffb037bb8 Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev am: 56cf05291e 
am: 217e152229

* commit '217e152229c51a6d535e6b739ab48c4091d6cd0e':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: I9b28c0c844c1d8a88e9869c9a525c32500ebc05b
 2016-06-06 19:31:31 +00:00
Guang Zhu
28a6a3f435 Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev 
am: 56cf05291e

* commit '56cf05291e1ffb54025a47ccb046f44c2d05ef14':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: Ibc04084e8123a0e0bfe9cbe1c34a1a767dde03ab
 2016-06-06 19:27:54 +00:00
Guang Zhu
217e152229 Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev 
am: 56cf05291e

* commit '56cf05291e1ffb54025a47ccb046f44c2d05ef14':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: If5e573f0fdb7d9ff8e70f4172fb0adf38c2b552a
 2016-06-06 19:27:52 +00:00
Guang Zhu
56cf05291e Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev 2016-06-06 19:22:32 +00:00
Garfield, Tan
d9ddb3ba5b Suppress auto-closing drawer and add ripple effect on spring load roots. 
Bug: 28865182
Change-Id: Ief7967e33b9a0d7e94a667172121d8007f78115b
(cherry picked from commit 17182ca46f7a8f3ae03bb8f5a16116246a5fbd91)
 2016-06-06 19:01:51 +00:00
Ben Lin
36c5e5de26 Merge "Adding docsui prefix to access metric tags." into nyc-dev am: de862e1cc8 am: 8454626813 
am: f5099d7c16

* commit 'f5099d7c163133ecd415a222cca7f3469378169d':
  Adding docsui prefix to access metric tags.

Change-Id: I4722276266d4a53fbc5a61cbbe05a9613dd0a3b8
 2016-06-06 18:17:57 +00:00
Ben Lin
f5099d7c16 Merge "Adding docsui prefix to access metric tags." into nyc-dev am: de862e1cc8 
am: 8454626813

* commit '84546268130f2d59d2844c14fb078db36bc61ceb':
  Adding docsui prefix to access metric tags.

Change-Id: I6b1ee9d80c19a475f7b1156f092e72d11bc2c68c
 2016-06-06 18:13:39 +00:00
Ben Lin
74190e4a38 Merge "Adding docsui prefix to access metric tags." into nyc-dev 
am: de862e1cc8

* commit 'de862e1cc82d96d22394201cb8867b643e4f2e93':
  Adding docsui prefix to access metric tags.

Change-Id: I74cae4f5a7b89411b0e7ebcee348ee05c1cc15f2
 2016-06-06 18:08:20 +00:00
Ben Lin
8454626813 Merge "Adding docsui prefix to access metric tags." into nyc-dev 
am: de862e1cc8

* commit 'de862e1cc82d96d22394201cb8867b643e4f2e93':
  Adding docsui prefix to access metric tags.

Change-Id: Id3dc690e4f753af51acb406565c643d2fdc01ec1
 2016-06-06 18:08:07 +00:00
Ben Lin
de862e1cc8 Merge "Adding docsui prefix to access metric tags." into nyc-dev 2016-06-06 18:04:12 +00:00
Guang Zhu
1ebd8416ae migrate documents UI tests to use AndroidJUnitRunner 
The runner replaces deprecated InstrumentationTestRunner, provides
equivalent functionality, and in addition support JUnit4, sharding
and per test method timeout.

Change-Id: I1c76996d347d3f0f378997f5e7b871279c2b032f
 2016-06-06 11:24:31 -04:00
Bill Yi
3be3f6cc5e Import translations. DO NOT MERGE 
Change-Id: I1af602c8252ce1006e26a8f965fe56e976fe3439
Auto-generated-cl: translation import
 2016-06-03 04:11:55 -07:00
Bill Yi
566cac1be3 Import translations. DO NOT MERGE 
Change-Id: I10d88a14b6477e7ba128653756a84c56ea5034c3
Auto-generated-cl: translation import
 2016-06-03 04:02:53 -07:00
Garfield Tan
cd9780abff Merge "Prioritize delete jobs by adding them to a separate thread pool." into nyc-andromeda-dev 
Conflicts:
	packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java

Change-Id: I1eb4f265891542f8db59349ce158b192f1b14315
 2016-06-02 10:17:59 -07:00
Bill Yi
52d8ad7855 Import translations. DO NOT MERGE 
Change-Id: Ibf30eed653e428b2d2d16c56c29d15c0c19556c1
Auto-generated-cl: translation import
 2016-05-31 23:41:50 -07:00
Steve McKay
5371f04cac Merge "Don\'t assert on uris with stack." into nyc-dev 
am: 760b557158

* commit '760b5571582056e756d9fb1bc366247bc26a8e54':
  Don't assert on uris with stack.

Change-Id: I888984060b578ecff9dfefc70e6adacafe49e14c
 2016-05-31 22:10:08 +00:00
Steve McKay
379b014ab5 Merge "Don\'t assert on uris with stack." into nyc-dev 
am: 760b557158

* commit '760b5571582056e756d9fb1bc366247bc26a8e54':
  Don't assert on uris with stack.

Change-Id: Id18689de7d04ae2627ea64612fe7fd8f2ac5f445
 2016-05-31 22:10:07 +00:00
Steve McKay
3c6d499858 Don't assert on uris with stack. 
This is legal arrangement when viewing Archives.
Bug: 28923366

Change-Id: I75a26edc8dac865f536a7c5bcdef1ba00b0883f0
(cherry picked from commit a379fad3b9b9e708e9211f7c026ddd13572fc16e)
 2016-05-31 20:32:55 +00:00
TreeHugger Robot
50d3baa543 Merge "Don't assert on uris with stack." 2016-05-31 19:59:42 +00:00
Steve McKay
a379fad3b9 Don't assert on uris with stack. 
This is legal arrangement when viewing Archives.
Bug: 28923366

Change-Id: I75a26edc8dac865f536a7c5bcdef1ba00b0883f0
 2016-05-31 11:01:43 -07:00
Ian Rogers
0a3c9cd428 Merge "Fix bad locking." 2016-05-31 17:58:58 +00:00
Ian Rogers
22101e2f3a Merge "Fix two confusing naming issues" 2016-05-31 13:56:39 +00:00
Bill Yi
b4e7af89ba Import translations. DO NOT MERGE 
Change-Id: I696083fb05e48caa59c5184654f40cd52e5e441b
Auto-generated-cl: translation import
 2016-05-30 16:12:15 -07:00
Garfield Tan
6402be9575 Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff am: f846d8518b" into nyc-mr1-dev-plus-aosp 
am: f4e1c42240

* commit 'f4e1c422405d965f25e98ca4f505c7c269608db2':
  Fix an assertion to avoid crash on deletions in Recent root.

Change-Id: Iafba5b17b7dd89ad9bfdc8e8719f4ade5ff4d8ee
 2016-05-27 22:02:59 +00:00
Ian Rogers
d73ff581f3 Fix two confusing naming issues 
android.R.string.yes is not "Yes" but "OK"; prefer android.R.string.ok for clarity
android.R.string.no is not "No" but "Cancel"; prefer android.R.string.cancel for clarity
Found by Error Prone.
Bug: 27723540

Change-Id: Ia6f58a7e7543ad1cc4e4722de8d095d1de8df034
 2016-05-27 14:40:59 -07:00
Ian Rogers
a5feec52a6 Fix bad locking. 
When synchronizing on a field, it should be final to avoid locking on different
objects.
Missing synchronization on use of mRunning caught by Error Prone's @GuardedBy
checker.
Bug: 27723540

Change-Id: I9d7c9e37f8ef5f7f49707bfdf607a6b73b9654d8
 2016-05-27 14:30:06 -07:00
Garfield Tan
da19f14dd5 Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff 
am: f846d8518b

* commit 'f846d8518bdf788bbba9ace89d8fd04c79946edd':
  Fix an assertion to avoid crash on deletions in Recent root.

Change-Id: I13b89ea99d8319da7cbb001a024814757b1beec7
 2016-05-27 03:50:58 +00:00
Garfield, Tan
f846d8518b Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev 
am: 7a91029bff

* commit '7a91029bff3d31e56f12ae1c070ba78043e49e0a':
  Fix an assertion to avoid crash on deletions in Recent root.

Change-Id: Ibae8befa4b424b3da4bd43edb74afc28c5e30f96
 2016-05-27 03:31:40 +00:00
Garfield, Tan
66f7553862 Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev 
am: 7a91029bff

* commit '7a91029bff3d31e56f12ae1c070ba78043e49e0a':
  Fix an assertion to avoid crash on deletions in Recent root.

Change-Id: I4374b0498599f72b1a9cbfd6b5bd95eef17438e4
 2016-05-26 23:56:20 +00:00
Steve McKay
716912e719 Move BandController out of MultiSelectManager. 
Improved dependency injection (elimination of propagating dependencies).
This change cleans up MultiSelectManager ahead of other improvements.
Also, cancel band select in response to touch events....else weird things happen.

Change-Id: I261d928ff7eb5d8a50791d5dd9d7202b324efc54
 2016-05-26 16:26:39 -07:00
Ben Lin
1a3b676441 Adding docsui prefix to access metric tags. 
Bug: 28934495
Change-Id: I44291b887e8aa9f4412ee1e7e1826ea68ffb40b9
 2016-05-26 16:19:21 -07:00
Garfield, Tan
01958b11ef Fix an assertion to avoid crash on deletions in Recent root. 
Bug: 28917333
Change-Id: I758c01898a6bb45cbf4975a1e7223efddd17a448
 2016-05-26 16:06:04 -07:00
Baligh Uddin
664663568b Merge "Import translations. DO NOT MERGE" 2016-05-26 16:30:25 +00:00
TreeHugger Robot
620364ad95 Merge "Separate paste code from DirectoryFragment." 2016-05-25 21:42:34 +00:00
Ben Lin
ddc35c5f3c Fixing some tests for Phone form-factor. 
Bug: 27533946
Change-Id: I70e15dee2ae7c14c1768d56ee04f87d05dd0f926
(cherry picked from commit 316c39b94c129652e7569fc7e4cd47af3cfb80d3)
 2016-05-25 18:39:46 +00:00
Garfield, Tan
6d0b46eb12 Separate paste code from DirectoryFragment. 
Also untie DocumentClipper from activities. We'll have a single
DocumentClipper across the app from now on.

Bug: 28742120
Change-Id: Ib9e2537c3499ba2fa0a203ddad3ae71246d5b009
(cherry picked from commit 0cd92d35c533c16b301bd228cce8c68a289407a1)
 2016-05-25 18:07:51 +00:00
Baligh Uddin
fb6e3d14a9 Import translations. DO NOT MERGE 
Change-Id: I28b4ca19206f974d71f129093668d20e06cc7ca3
Auto-generated-cl: translation import
 2016-05-24 14:24:43 -07:00
Garfield, Tan
1ec6f295d1 Load up-to-date thumbnail if the cached one is out of date. 
Bug: 28557412
Change-Id: Ib3ef9962249305be22b7a1e49e26350f3596e430
(cherry picked from commit aacb9219a791d2e4415cbbcacc12caed424dff83)
 2016-05-24 19:55:33 +00:00
Bill Yi
10a97d51b2 Import translations. DO NOT MERGE 
Change-Id: Ie8cae0e6c135646c9884a6fb467e0701d207d5ed
Auto-generated-cl: translation import
 2016-05-22 23:38:16 -07:00