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

513 Commits

Author SHA1 Message Date
Jeff Sharkey
d3e5453f2e am 3d00f7a1: Merge "Finish when browsed root goes away." into mnc-dev 
* commit '3d00f7a1be6ff858a89e2220f33231ecb3570ef3':
  Finish when browsed root goes away.
 2015-06-17 04:08:17 +00:00
Jeff Sharkey
8bb1245a48 Finish when browsed root goes away. 
If we're browsing a specific root, and that root went away, typically
due to formatting.

Bug: 21831184
Change-Id: Ie07607a81e32a7d82c88ad382658a471d47b905d
 2015-06-16 20:54:14 -07:00
Geoff Mendal
ee4a297766 Import translations. DO NOT MERGE 
Change-Id: I7bb1d35595971e4d2ff83ba40c01524ed243d26d
Auto-generated-cl: translation import
 2015-06-15 08:39:05 -05:00
Jeff Sharkey
415cc61096 am 8a265146: Merge "Selected count string needs plurals." into mnc-dev 
* commit '8a26514687ccf651eb73d5acdd3ae7c62d247d97':
  Selected count string needs plurals.
 2015-06-11 18:27:55 +00:00
Jeff Sharkey
8a26514687 Merge "Selected count string needs plurals." into mnc-dev 2015-06-11 18:21:08 +00:00
Jeff Sharkey
f491c72e4a Selected count string needs plurals. 
Bug: 21717427
Change-Id: Ie0db8ac30244b022ca5838969fb085230bfc4499
 2015-06-11 09:19:37 -07:00
Daichi Hirono
0d53e4d1c0 am 4ba81a08: Merge "Update visibility of the stack dropdown list after the search view is collapsed." into mnc-dev 
* commit '4ba81a0878d058734e9eb2c298d7fc4df7e597ed':
  Update visibility of the stack dropdown list after the search view is collapsed.
 2015-06-11 05:39:19 +00:00
Daichi Hirono
186efa3836 Update visibility of the stack dropdown list after the search view is collapsed. 
Previously we hid the stack dropdown list just before the action bar is
collapsed. Then the dropdown list gets back to be visible when the action bar is
collapsed.

The CL updates visibility of the stack dropdown list just after the action bar
is collapsed.

BUG=20945584
Change-Id: Iaf5055bce101f8134accd311829e50f441ddc98b
 2015-06-11 14:29:28 +09:00
Jeff Sharkey
e1844c8302 am 5fc24733: New strings! 
* commit '5fc247338dfc1a817f708163201cdf395cff3303':
  New strings!
 2015-06-11 01:33:25 +00:00
Jeff Sharkey
5fc247338d New strings! 
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If1c5882d48f798d311f6d2b86277d3c13f06824e
 2015-06-10 16:49:11 -07:00
Ben Kwa
e04b20dd76 am c783a5e7: Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 
* commit 'c783a5e762b0c4925756b8ca273eb26aab5e7985':
  Enable apps to exclude their own roots from the DocumentsUI roots list.
 2015-06-10 18:44:57 +00:00
Ben Kwa
c783a5e762 Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 2015-06-10 18:30:31 +00:00
Ben Kwa
77797400ec Enable apps to exclude their own roots from the DocumentsUI roots list. 
- Add DocumentsContract.EXTRA_EXCLUDE_SELF (boolean extra)
- Add code to DocumentsActivity to cache the providers of the calling
  app if EXTRA_EXCLUDE_SELF is set on incoming Intents.
- Add code to RootsCache to exclude roots from the calling app.
- Add code to allow only system apps to use EXTRA_PACKAGE_NAME.

Change-Id: Ia7cc2a1a297676c7b26f6e583042a4607d8c9a4e
 2015-06-10 11:24:55 -07:00
Geoff Mendal
09e34e989c Import translations. DO NOT MERGE 
Change-Id: I8f8557a777e3b2ed58593aa20d1a2b0f2a5aa33b
Auto-generated-cl: translation import
 2015-06-10 08:55:37 -05:00
Ben Kwa
8f0514769e am 907c695d: Merge "Add a divider between the roots selector and files list." into mnc-dev 
* commit '907c695d40a95fc4d06969adeceea1756390d3c3':
  Add a divider between the roots selector and files list.
 2015-06-09 17:53:22 +00:00
Ben Kwa
907c695d40 Merge "Add a divider between the roots selector and files list." into mnc-dev 2015-06-09 17:48:31 +00:00
Ben Kwa
30fefe40c6 am 7c04308f: Merge "Clean up icons in DocumentsUI." into mnc-dev 
* commit '7c04308f51486644d474326eb19159af00ffaa17':
  Clean up icons in DocumentsUI.
 2015-06-09 17:46:02 +00:00
Ben Kwa
a6a50d037b Add a divider between the roots selector and files list. 
BUG=21643911

Change-Id: Ie7c4d1a014b9fbdccb91d80907c89e2309c9891f
 2015-06-09 10:43:59 -07:00
Ben Kwa
7c04308f51 Merge "Clean up icons in DocumentsUI." into mnc-dev 2015-06-09 17:35:20 +00:00
Ben Kwa
11be5de36c Clean up icons in DocumentsUI. 
- Remove unused icons.
- Replace improperly sized icons with properly sized (24dp) ones.

BUG=21643433

Change-Id: I67595b6bfbbf94f11abe6c1feabe633488decc84
 2015-06-08 14:11:33 -07:00
Geoff Mendal
124103fa52 Import translations. DO NOT MERGE 
Change-Id: I8592894958f93b88c36e60e0484f5a1ff6a1bc3a
Auto-generated-cl: translation import
 2015-06-08 08:45:04 -05:00
Ben Kwa
7eb2d726e8 am 8dbb4328: Merge "Fix drawer selection to match Material spec." into mnc-dev 
* commit '8dbb43289ccc6bf85399eb3737be0dd5f01de923':
  Fix drawer selection to match Material spec.
 2015-06-05 01:04:52 +00:00
Ben Kwa
8dbb43289c Merge "Fix drawer selection to match Material spec." into mnc-dev 2015-06-05 00:51:54 +00:00
Ben Kwa
50698068c1 Fix drawer selection to match Material spec. 
- highlighted text changed to match the application primary color
- change highlighted background to light gray
- remove highlight icon tinting (provides insufficient contrast against
  the new light gray background)

BUG=18685226

Change-Id: I4040fa951fd2822cea324e0bd1924d10024b6a11
 2015-06-04 16:28:16 -07:00
Geoff Mendal
f806744fce Import translations. DO NOT MERGE 
Change-Id: I7855e24fc4715b1bf7cf978dd40b3bd66f242427
Auto-generated-cl: translation import
 2015-06-03 11:51:22 -05:00
Steve McKay
db770eb43c am 92dce157: Update hamburger share, and delete icons to use the 24x MD icons. 
* commit '92dce1578747f501c48b2542146956744675b784':
  Update hamburger share, and delete icons to use the 24x MD icons.
 2015-06-02 23:21:18 +00:00
Steve McKay
92dce15787 Update hamburger share, and delete icons to use the 24x MD icons. 
BUG=18685222,17699796
Change-Id: I4b14b83eca7fe30e250e1252cb384bc94e05e0a4
(cherry picked from commit e07525536b7edf584ffc96ba69951794d6096b57)
 2015-06-02 23:07:40 +00:00
Geoff Mendal
14a4c5d418 Import translations. DO NOT MERGE 
Change-Id: I04d01f1c65927634e8b27c3780e5e392fcdba28b
Auto-generated-cl: translation import
 2015-06-01 07:51:58 -07:00
Geoff Mendal
db52f0a5db Import translations. DO NOT MERGE 
Change-Id: I40a24917618ab5fb0c5ef063b6ccc6b845bf0ec9
Auto-generated-cl: translation import
 2015-05-30 19:36:14 -07:00
Jeff Sharkey
1bf1af0492 am d659f450: Fix the build months later? 
* commit 'd659f450f3d9c113cbd2ddc4f592b7fc64d1c9cf':
  Fix the build months later?
 2015-05-30 18:36:41 +00:00
Jeff Sharkey
d659f450f3 Fix the build months later? 
Change-Id: Ic5902fbe39cf2b536eb75682ad18f06e1ad8983e
 2015-05-30 11:20:45 -07:00
Geoff Mendal
cdd71a3087 Revert "Import translations. DO NOT MERGE" 
This reverts commit f3173d8a1797fd812997b9246502a05df0591363.

Change-Id: I7e24d340c24f7ba4b67a72d54e57c3558caa7267
 2015-05-29 15:33:18 +00:00
Geoff Mendal
f3173d8a17 Import translations. DO NOT MERGE 
Change-Id: I30219f300510a51079cb2e514c00f476590e06d5
Auto-generated-cl: translation import
 2015-05-29 07:31:36 -07:00
Ben Kwa
c016b3ba7d am 7a3b2012: Merge "Ensure that the copy notification is always cancelable." into mnc-dev 
* commit '7a3b2012ea4d079a50edb8aa101a353830219d29':
  Ensure that the copy notification is always cancelable.
 2015-05-27 21:34:10 +00:00
Ben Kwa
7c0ade56f3 Ensure that the copy notification is always cancelable. 
If the CopyService dies or is stopped for whatever reason, the cached
"current" job ID will go to null.  In that case, the cancel intent will
be ignored, and the copy notification can never be dismissed.  Adding a
null check to the handleCancel method of CopyService fixes this.

BUG=21365043
Change-Id: I0615328f6033a313fec79f8b63291c7f7373ea0f
 2015-05-27 09:19:28 -07:00
Geoff Mendal
32156a7586 Import translations. DO NOT MERGE 
Change-Id: Id4da8170bceabc117824f81c25a6019f5584ce0b
Auto-generated-cl: translation import
 2015-05-25 09:53:44 -05:00
Steve McKay
08226358a1 am 4f95bade: Merge "[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!" into mnc-dev 
* commit '4f95badec267c53f76475869b17f6bbccc66d406':
  [mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!
 2015-05-21 20:38:57 +00:00
Steve McKay
4f95badec2 Merge "[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!" into mnc-dev 2015-05-21 20:27:37 +00:00
Steve McKay
574b4bcd1b [mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev! 
BUG=21259006
Change-Id: Ic31dfa1a1cffa4340769c08db3e3cb3fb46e31d5
(cherry picked from commit e04e02d027b731448d68995a202c8867c4985fa3)
 2015-05-21 20:15:31 +00:00
Geoff Mendal
dc038f3246 Import translations. DO NOT MERGE 
Change-Id: Ibc636bc980ceaead21d2eaf2dd813de284341ab0
Auto-generated-cl: translation import
 2015-05-21 06:10:03 -07:00
Daichi Hirono
15a5593309 am b7d072f4: Merge "DocumentUI: Plish the design of footer bottons." into mnc-dev 
* commit 'b7d072f42fd4fcb2e6e2d7a88ede2d4cee05127c':
  DocumentUI: Plish the design of footer bottons.
 2015-05-19 22:34:38 +00:00
Daichi Hirono
e9cbfe8e5a DocumentUI: Plish the design of footer bottons. 
* Remove the directory name from "pick" button.
* Allign buttons at right.
* Fix bug that the pick button turns to be hidden after screen rotation.

BUG=20285152
Change-Id: I909d52f341bf67c5627431a354a9b0ccec152a05
 2015-05-18 11:27:15 +09:00
Steve McKay
3ac67f6cf9 am b3100f4b: Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev 
* commit 'b3100f4b13159deb0b5736aedca1659dfe3c762b':
  Delete StandaloneActivity from M (DO NOT MERGE)
 2015-05-11 16:33:59 +00:00
Steve McKay
b3100f4b13 Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev 2015-05-11 16:21:02 +00:00
Steve McKay
6e02dc8cd6 Delete StandaloneActivity from M (DO NOT MERGE) 
The activity is already disabled by default.
Fix an issue where copy support error handling was attempting to invoke StandaloneActivity.

Change-Id: If15c312a183cae1b2a84517e7f7b3123c11bd619
 2015-05-11 16:19:00 +00:00
Geoff Mendal
ebb3a45a67 Import translations. DO NOT MERGE 
Change-Id: I0999d1abf6951574e9ba7fc6c8a608aaea4540de
Auto-generated-cl: translation import
 2015-05-11 06:14:14 -07:00
Ben Kwa
75597d0dc5 Clean up error handling in CopyService. 
Change-Id: I87b9f2c2cfddc222fbee64578b0a1349508a244f
 2015-05-05 11:58:38 -07:00
Ben Kwa
efb70fd8a0 Merge "Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE" into mnc-dev 2015-05-05 18:54:07 +00:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Ben Kwa
c7a01cfe15 Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE 
Send copy errors to the destination provider.
Big overhaul of tests to make them simpler.
Test that errors during copying are detected and partial copies are
cleaned up.
Test that copying empty directories works properly.

Change-Id: I3fe0e73bdc92c2b6f522857ca5631f6d03d5a666
(cherry picked from commit dae8c378d6c680ae9efa8e1202d9bc92fb0dfb11)
 2015-05-04 20:28:44 +00:00