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

621 Commits

Author SHA1 Message Date
Jeff Sharkey
177c9c8c14 Merge commit '3bc83eb0' into downstream 
Change-Id: Id3980b39889f28ab42284119747eb461be0a3ce5
 2015-07-15 15:54:20 -07:00
Jeff Sharkey
6663f84470 am b5405b45: am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev 
* commit 'b5405b45784cebf978b6102d324a1018fe66deb6':
  Only send EXTRA_STACK for private intent.
 2015-07-15 22:11:18 +00:00
Jeff Sharkey
b5405b4578 am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev 
* commit '350b99c0027902db22004ea037265349155d7c38':
  Only send EXTRA_STACK for private intent.
 2015-07-15 21:59:31 +00:00
Jeff Sharkey
350b99c002 am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev 
* commit '483bd84280ef667e306ec7246d85423ca6b1fde7':
  Only send EXTRA_STACK for private intent.
 2015-07-15 21:43:48 +00:00
Jeff Sharkey
04ec6f4f09 Only send EXTRA_STACK for private intent. 
Since it's a private Parcelable class, we can't send it to other
third-party apps, since they won't know how to unpack it.

Bug: 22255387
Change-Id: Ie2ea6cf72b733bd122eb3581a5df295cec608425
 2015-07-15 09:13:14 -07:00
Geoff Mendal
f0e20f32ea Import translations. DO NOT MERGE 
Change-Id: I52e64cacb7fc880be84d51800275d845c2215b83
Auto-generated-cl: translation import
 2015-07-15 05:13:54 -07:00
Oren Blasberg
78b8afd525 Merge "Load Downloads view in full screen." 2015-07-15 01:17:02 +00:00
Geoff Mendal
da868b9a00 Import translations. DO NOT MERGE 
Change-Id: Ia6c22efa7d0a9bb73d3d60063228927274209e18
Auto-generated-cl: translation import
 2015-07-11 13:39:58 -07:00
Geoff Mendal
85db320ec8 Import translations. DO NOT MERGE 
Change-Id: I27f86997807a65c6dfd9eba377f9bce991a3815e
Auto-generated-cl: translation import
 2015-07-11 05:21:15 -07:00
Oren Blasberg
9e9c246f56 Load Downloads view in full screen. 
BUG=17467808

Change-Id: I70f2ed074d3f08cc7d70f0228b763de25142014a
 2015-07-08 13:17:18 -07:00
Geoff Mendal
20ad92460b Import translations. DO NOT MERGE 
Change-Id: I173b85dbcf36fdc7023137949f7bb416dabc2cf5
Auto-generated-cl: translation import
 2015-07-08 06:43:44 -07:00
Geoff Mendal
8179e27121 Import translations. DO NOT MERGE 
Change-Id: I20c772a415cd96f3b0c00d10a50cdfe617e94fe9
Auto-generated-cl: translation import
 2015-07-08 05:14:50 -07:00
Jeff Sharkey
bbdb0e5498 am f536a97e: am 67ba3616: am b61e53f5: am e6130b6c: am 6d842f63: Merge "Fix DocumentsUI animation regression." into mnc-dev 
* commit 'f536a97e7cbb41f927b8c65f3a56b2932a5c0157':
  Fix DocumentsUI animation regression.
 2015-07-07 00:30:53 +00:00
Makoto Onuki
3b31613088 resolved conflicts for merge of 57db559d to master 
Change-Id: I645993fe69116f05e2275771b51a36402ba05472
 2015-07-06 13:00:51 -07:00
Jeff Sharkey
67ba36163a am b61e53f5: am e6130b6c: am 6d842f63: Merge "Fix DocumentsUI animation regression." into mnc-dev 
* commit 'b61e53f5f1bcbf3c9059a3ff58867990f5dde9a7':
  Fix DocumentsUI animation regression.
 2015-07-06 19:01:33 +00:00
Makoto Onuki
0e301ffa0f am 650a193e: am 164d229a: am dfd6301f: Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev 
* commit '650a193e8b1610938954851e6d855338b44e239d':
  If user ejects a storage from details, take user to... ... the storage list view
 2015-07-06 19:00:38 +00:00
Jeff Sharkey
e6130b6c50 am 6d842f63: Merge "Fix DocumentsUI animation regression." into mnc-dev 
* commit '6d842f63a00e34edb583f9fdd6f233c20dcd00f2':
  Fix DocumentsUI animation regression.
 2015-07-06 18:12:41 +00:00
Makoto Onuki
164d229a1c am dfd6301f: Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev 
* commit 'dfd6301fa2570ae5b012dd964847531bdfdb3f4b':
  If user ejects a storage from details, take user to... ... the storage list view
 2015-07-06 18:05:04 +00:00
Jeff Sharkey
6d842f63a0 Merge "Fix DocumentsUI animation regression." into mnc-dev 2015-07-06 17:58:10 +00:00
Makoto Onuki
dfd6301fa2 Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev 2015-07-06 17:13:29 +00:00
Geoff Mendal
88b4a0ac56 Import translations. DO NOT MERGE 
Change-Id: Icd52bfb7b30de7dbc2c7c7e7f073a4fddb5fa5e3
Auto-generated-cl: translation import
 2015-07-06 08:43:33 -05:00
Geoff Mendal
be975a429c Import translations. DO NOT MERGE 
Change-Id: I89ab7db17ac523c3a1d71c8c74960b0d1307f61a
Auto-generated-cl: translation import
 2015-07-06 07:20:00 -05:00
Jeff Sharkey
1f6c9a1214 Fix DocumentsUI animation regression. 
Various fragments need backgrounds to protect their contents during
animation transitions.

Bug: 22232368
Change-Id: I4ce4c57650f9b64b3c6101d829dd484417585410
 2015-07-05 14:44:51 -07:00
Makoto Onuki
14a6df7d76 If user ejects a storage from details, take user to... 
... the storage list view

1. Change to ExternalStorageProvider
When available volumes have changed, it now notifies on
"content://com.android.externalstorage.documents" rather than on
"content://com.android.externalstorage.documents/root/", because it'll also
affect "content://com.android.externalstorage.documents/document/*/children".

2. Change to DocumentUI
- DirectoryLoader now won't crash when a provider returns null.
- DirectoryFragment now closes itself (i.e. emulate a back press) when a load
failed.
- It now correctly reloads contents when a volume is ejected thanks to 1.

Bug 21472170

Change-Id: Icf4bbc2ebb9067313dbbb67083cd4115b0a75c58
 2015-07-01 15:11:46 -07:00
Geoff Mendal
c9b6c1767f Import translations. DO NOT MERGE 
Change-Id: Id27150d5e6b378f1fe9e79eb0ea8b88392b2cd09
Auto-generated-cl: translation import
 2015-07-01 08:38:57 -05:00
Geoff Mendal
867990c7e8 Import translations. DO NOT MERGE 
Change-Id: I3b9f06bfe39442655409eab50324e288ab9cb3b9
Auto-generated-cl: translation import
 2015-07-01 07:17:50 -05:00
Geoff Mendal
d38d3e2b1f Import translations. DO NOT MERGE 
Change-Id: Ia1829162e64c53a9c9df9211f41bf29d4e67fd20
Auto-generated-cl: translation import
 2015-06-29 08:40:48 -05:00
Geoff Mendal
2f3ce3c059 Import translations. DO NOT MERGE 
Change-Id: I00a868170fb275da10a7a5833a1dc9f8af3e75c2
Auto-generated-cl: translation import
 2015-06-29 07:17:27 -05:00
Makoto Onuki
e9b4972d24 am a4e38b9d: am 423c824b: am d1e62d9d: Merge "Remove default activity title to prevent talkback from..." into mnc-dev 
* commit 'a4e38b9d86c59e033f0d17ee7ac96734133881ac':
  Remove default activity title to prevent talkback from...
 2015-06-24 00:40:30 +00:00
Makoto Onuki
423c824b50 am d1e62d9d: Merge "Remove default activity title to prevent talkback from..." into mnc-dev 
* commit 'd1e62d9dfd0c995084046188fbde7dac40401162':
  Remove default activity title to prevent talkback from...
 2015-06-24 00:12:22 +00:00
Makoto Onuki
9feac1425c Remove default activity title to prevent talkback from... 
reading the wrong title.

We get a title from DocumentProvider with an async task, and by the time we
get it, it's *usually* too late and talkback end up reading the default title.

Bug 20041072

Change-Id: I7686fe4ae4c157ebfc07bd8b895c4cfdf99c057a
 2015-06-23 16:51:45 -07:00
Alan Viverette
afc21d72d8 am f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev 
* commit 'f1da9a1401fe1304bee8a550a0141c79ecc3c0b3':
  DO NOT MERGE: Remove DayNight theme
 2015-06-18 22:31:41 +00:00
Alan Viverette
15d48a16f6 DO NOT MERGE: Remove DayNight theme 
Do not go gentle into that good night,
Old age should burn and rave at close of day;
Rage, rage against the dying of the light.

Though wise men at their end know dark is right,
Because their words had forked no lightning they
Do not go gentle into that good night.

Bug: 21854466
Change-Id: I0b7cd116c23f7df88e94f31b3aee7dd22a102804
 2015-06-18 15:15:16 -07:00
Jeff Sharkey
67f74e6f90 Finish when browsed root goes away. 
If we're browsing a specific root, and that root went away, typically
due to formatting.

Skipped auto-merging this CL to master last night as it was causing
a merge conflict.  Cherry-picking it to master today (with the conflict
resolved).

Bug: 21831184
Change-Id: Ie07607a81e32a7d82c88ad382658a471d47b905d
 2015-06-17 19:23:58 -07:00
Tomasz Mikolajewski
8a246ea3ff am 9223788e: am 327dbb57: am 41ce0039: Merge "Remove the action bar icon when there is no drawer enabled." into mnc-dev 
* commit '9223788e655784417e1cf0023d78b5d850dd0d1e':
  Remove the action bar icon when there is no drawer enabled.
 2015-06-18 00:54:51 +00:00
Tomasz Mikolajewski
58461ebdef am 87a45380: am 456778ff: am 9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev 
* commit '87a4538034d41964ed81b69749939c1868505847':
  Allow to customize title of the dialog.
 2015-06-18 00:31:20 +00:00
Tomasz Mikolajewski
327dbb57c3 am 41ce0039: Merge "Remove the action bar icon when there is no drawer enabled." into mnc-dev 
* commit '41ce003934c228f68e82645062665e0d2c443781':
  Remove the action bar icon when there is no drawer enabled.
 2015-06-18 00:23:57 +00:00
Tomasz Mikolajewski
41ce003934 Merge "Remove the action bar icon when there is no drawer enabled." into mnc-dev 2015-06-18 00:15:52 +00:00
Tomasz Mikolajewski
456778ffaf am 9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev 
* commit '9ce9ffec9e307e29c3d575854d4e357ecf06d2d8':
  Allow to customize title of the dialog.
 2015-06-18 00:02:57 +00:00
Tomasz Mikolajewski
0e591f95bd Allow to customize title of the dialog. 
TEST=adb shell am start -a android.intent.action.OPEN_DOCUMENT -e
     android.intent.extra.TITLE 'Upload!' -t "text/plain"
BUG=19150996

Change-Id: Ibded6cfaa2de3698c5eada154efbee2b323464d4
 2015-06-17 16:12:14 -07:00
Geoff Mendal
a946fe87e4 Import translations. DO NOT MERGE 
Change-Id: Ie78d85789becd82c6fd468d50a47516711e5715a
Auto-generated-cl: translation import
 2015-06-17 08:45:37 -05:00
Geoff Mendal
a6ffbff880 Import translations. DO NOT MERGE 
Change-Id: Ia80a86ea64548c6cc8694feb1774d5b1299c7571
Auto-generated-cl: translation import
 2015-06-17 07:19:56 -05:00
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
Geoff Mendal
57883d5de3 Import translations. DO NOT MERGE 
Change-Id: I42135483910df8a810bd373ade898cb0a9962a8c
Auto-generated-cl: translation import
 2015-06-15 07:14:23 -05:00
Tomasz Mikolajewski
536ac48aa9 Remove the action bar icon when there is no drawer enabled. 
Keep the hamburger menu though if the drawer is visible and unlocked.

TEST=Tested manually on both tablet and phone form factors.
BUG=18685509

Change-Id: Ie6f8d7064da99d2dc34315ccb92ab4db6ee321b6
 2015-06-12 15:33:45 -07:00
Jeff Sharkey
7f9cbf94f4 am 2656fa06: am 415cc610: am 8a265146: Merge "Selected count string needs plurals." into mnc-dev 
* commit '2656fa065f820873695ba7743ad0a2ff7d913567':
  Selected count string needs plurals.
 2015-06-11 18:47:58 +00: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