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

780 Commits

Author SHA1 Message Date
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
Narayan Kamath
5f3699685b resolved conflicts for merge of 70be78a8 to master 
Change-Id: I0743be4b22602ad0255998d22cff345c36a60ecb
 2015-06-11 18:00:26 +01: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
9c9661f1b7 am 51b055d3: am e1844c83: am 5fc24733: New strings! 
* commit '51b055d330279f5d0a38ad1c33540189e71356e8':
  New strings!
 2015-06-11 02:34:28 +00:00
Jeff Sharkey
e1844c8302 am 5fc24733: New strings! 
* commit '5fc247338dfc1a817f708163201cdf395cff3303':
  New strings!
 2015-06-11 01:33:25 +00:00
Ben Kwa
ad144ea6bb Merge "resolved conflicts for merge of 3aff4fc6 to master" 2015-06-11 01:26:44 +00:00
Ben Kwa
cf1e2f03df resolved conflicts for merge of 3aff4fc6 to master 
Change-Id: Id816d859f929de3bd0328ef3a67e2bef9fadf28b
 2015-06-10 18:22:10 -07:00
Daichi Hirono
0fe674db7e Merge "DocumentUI: Plish the design of footer bottons." 2015-06-11 01:10:30 +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
Steve McKay
6bcc15ddfd Merge "Delete unused ColumnAdapter class." 2015-06-10 18:07:01 +00: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
Geoff Mendal
3c8a0debbf Import translations. DO NOT MERGE 
Change-Id: I6eba661705980ad16917844a08123cb49220a102
Auto-generated-cl: translation import
 2015-06-10 07:32:57 -05:00
Ben Kwa
c65ef084f9 am 86804949: am 8f051476: am 907c695d: Merge "Add a divider between the roots selector and files list." into mnc-dev 
* commit '86804949c92860b1392665762c1dfa484ab69849':
  Add a divider between the roots selector and files list.
 2015-06-09 18:11:38 +00:00
Ben Kwa
4edd0b2a9e am b71ef5e0: am 30fefe40: am 7c04308f: Merge "Clean up icons in DocumentsUI." into mnc-dev 
* commit 'b71ef5e046de6acf80771b6a031167d6eefde6b8':
  Clean up icons in DocumentsUI.
 2015-06-09 18:11:21 +00: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
Geoff Mendal
25f4db51fa Import translations. DO NOT MERGE 
Change-Id: I6c8699b70e45e6cc05d76d9fbeccbf218228f1fd
Auto-generated-cl: translation import
 2015-06-08 07:22:18 -05:00
Ben Kwa
fc181d7b9e am e4c632f8: am 7eb2d726: am 8dbb4328: Merge "Fix drawer selection to match Material spec." into mnc-dev 
* commit 'e4c632f820128e54a21c08922f1e843c599bfa73':
  Fix drawer selection to match Material spec.
 2015-06-05 01:27:27 +00: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
Steve McKay
b390585471 Delete unused ColumnAdapter class. 
Change-Id: I8aacd3c5d5fab8dea5e47cfad6a95e3da1eb5222
 2015-06-03 16:27:02 -07:00
Steve McKay
b437da904f Merge "Fix typo in paste warning string." 2015-06-03 20:06:53 +00:00
Steve McKay
549636b2aa Fix typo in paste warning string. 
BUG=21545788
Change-Id: I6e6265104bb8759c092f247223aef6c0426d844a
 2015-06-03 11:23:45 -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
Geoff Mendal
91b00537e4 Import translations. DO NOT MERGE 
Change-Id: I83528fc8a3736d1f951bee05155b956352b8be19
Auto-generated-cl: translation import
 2015-06-03 10:03:46 -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
Steve McKay
e8260443b5 Merge "Update hamburger share, and delete icons to use the 24x MD icons." 2015-06-02 23:07:25 +00:00
Steve McKay
e07525536b Update hamburger share, and delete icons to use the 24x MD icons. 
BUG=18685222,17699796
Change-Id: I4b14b83eca7fe30e250e1252cb384bc94e05e0a4
 2015-06-02 15:01:14 -07:00
Ben Kwa
371dee33df Merge "Fix text on move notifications and toasts." 2015-06-02 14:20:36 +00:00
Jeff Sharkey
e2de54a17d am 819bf267: am 1bf1af04: am d659f450: Fix the build months later? 
* commit '819bf2675518585b529943603d46df1d4e50e6b1':
  Fix the build months later?
 2015-06-01 17:25:34 +00:00