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

220592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
33fcff8086 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: db4f28692a -s ours am: ad3bd48dfe -s ours 
am: dd21740d6b  -s ours

* commit 'dd21740d6b6ec56e812cd2845c85fe3efd3e3e6a':
  Import translations. DO NOT MERGE
 2015-10-26 19:59:46 +00:00
Geoff Mendal
eac54076f2 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 9865051825 -s ours am: fe4a48c010 -s ours 
am: 4604e75970  -s ours

* commit '4604e7597041f17dce0f9469ab5dcaae32426cf4':
  Import translations. DO NOT MERGE
 2015-10-26 19:58:17 +00:00
Geoff Mendal
ff20c28c38 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 337495bded -s ours 
am: 515e97a52c  -s ours

* commit '515e97a52c0b15d3e7a2d629d3faa821fa4f285e':
  Import translations. DO NOT MERGE
 2015-10-26 19:52:50 +00:00
Geoff Mendal
dd21740d6b Merge "Import translations. DO NOT MERGE" into cw-e-dev am: db4f28692a -s ours 
am: ad3bd48dfe  -s ours

* commit 'ad3bd48dfe219ac6cb8531f7a7750437c75b0fa3':
  Import translations. DO NOT MERGE
 2015-10-26 19:51:18 +00:00
Geoff Mendal
4604e75970 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 9865051825 -s ours 
am: fe4a48c010  -s ours

* commit 'fe4a48c01056f539f041572c5b685fa44eddb9f4':
  Import translations. DO NOT MERGE
 2015-10-26 19:49:00 +00:00
Vladislav Kaznacheev
077794468a Merge "Fix drag and drop URI permission grants" 2015-10-26 19:46:21 +00:00
Geoff Mendal
515e97a52c Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 337495bded  -s ours

* commit '337495bded9c4035a922274143c1ab119e692bdd':
  Import translations. DO NOT MERGE
 2015-10-26 19:44:27 +00:00
Geoff Mendal
ad3bd48dfe Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: db4f28692a  -s ours

* commit 'db4f28692aacccb57d64f86b3dfd4205bafebf9b':
  Import translations. DO NOT MERGE
 2015-10-26 19:42:59 +00:00
Geoff Mendal
fe4a48c010 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 9865051825  -s ours

* commit '9865051825fbc709510deefa129c4210fadf057a':
  Import translations. DO NOT MERGE
 2015-10-26 19:40:56 +00:00
Geoff Mendal
337495bded Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 19:36:01 +00:00
Geoff Mendal
db4f28692a Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 19:35:20 +00:00
Geoff Mendal
9865051825 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 19:35:02 +00:00
Wale Ogunwale
67b78a3dae Merge changes I8ac518ce,I8392b4c3,I3bef3f75 
* changes:
  Support for activity to opt-in/out of PiP form of multi-window.
  API for moving top activity in a stack to pinned stack.
  Added support for pinned stack.
 2015-10-26 19:27:57 +00:00
Wale Ogunwale
8227969644 Merge "Removed use of leanback mode in ActivityManager." 2015-10-26 19:27:32 +00:00
Geoff Mendal
c5874fb8ab Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 8961b24ff2 -s ours am: 7976a3fbf4 -s ours 
am: cc7abc5edd  -s ours

* commit 'cc7abc5eddf9c2a47456103a720d28609e94b658':
  Import translations. DO NOT MERGE
 2015-10-26 19:25:11 +00:00
Wale Ogunwale
b60692e3d8 Support for activity to opt-in/out of PiP form of multi-window. 
While it makes sense to be able to resize most activities types
in multi-window mode. It only makes sense to put specific types
of activities in Picture-in-Picture (PiP) form of multi-window.
For example, activities that play video will be good candidates
while the Settings activity isn't.

The new flag allows the system to differentiate between resizeable
activities that can go into PiP mode and those that can't.

Bug: 25006507
Change-Id: I8ac518cec2fa3c8fb88be40c266b3751fb88f1ce
 2015-10-26 12:23:59 -07:00
Geoff Mendal
55f91b7e54 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 4917e9dd1c -s ours am: e8be87e96f -s ours 
am: b45b5ee1ca  -s ours

* commit 'b45b5ee1ca8c014f41e2aba6186285f573437aae':
  Import translations. DO NOT MERGE
 2015-10-26 19:23:46 +00:00
Geoff Mendal
b55de5453c Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 82b5276866 -s ours am: 76941becab -s ours 
am: 5f4f059440  -s ours

* commit '5f4f059440f1d438280a829c6f1db42a2f432372':
  Import translations. DO NOT MERGE
 2015-10-26 19:22:19 +00:00
Winson Chung
0b5c65a3e1 Merge "Adding flag for disabling search bar." 2015-10-26 19:20:30 +00:00
Winson
2364f26dc2 Adding flag for disabling search bar. 
Change-Id: I988912c8209f1e49c71e4db2a7b926c808dbc975
 2015-10-26 12:18:14 -07:00
Geoff Mendal
cc7abc5edd Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 8961b24ff2 -s ours 
am: 7976a3fbf4  -s ours

* commit '7976a3fbf4581b7b9ef531e8dcd7e6e889d08d76':
  Import translations. DO NOT MERGE
 2015-10-26 19:16:11 +00:00
Geoff Mendal
b45b5ee1ca Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 4917e9dd1c -s ours 
am: e8be87e96f  -s ours

* commit 'e8be87e96f7c9e854e7ac57475f38fedb8e1cac8':
  Import translations. DO NOT MERGE
 2015-10-26 19:14:46 +00:00
Geoff Mendal
5f4f059440 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 82b5276866 -s ours 
am: 76941becab  -s ours

* commit '76941becab388c347577dfc60d6fae4b190b684a':
  Import translations. DO NOT MERGE
 2015-10-26 19:13:04 +00:00
Ben Kwa
9f06a2f10d Merge "Fix a DocsUI crash due to a misnamed xml reference." 2015-10-26 19:12:50 +00:00
Steve McKay
86040a82d5 Merge "Add functional tests for FilesActivity." 2015-10-26 19:11:18 +00:00
Steve McKay
01792570ba Add functional tests for FilesActivity. 
Adds a bare bones test provider with dummy data.
This is basically just the bones of a test at this point.
Has just one simple test...switch list/grid modes.
Will add more tests (like manipulating the dummy data) in future CLs.

Bug: 24988170
Change-Id: Icc25718a416bc804874835c74a6d7862a52c9861
 2015-10-26 12:10:40 -07:00
Geoff Mendal
7976a3fbf4 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 8961b24ff2  -s ours

* commit '8961b24ff2541fc246e275ae3cc4cdda64934462':
  Import translations. DO NOT MERGE
 2015-10-26 19:08:26 +00:00
Wale Ogunwale
079a0044a3 API for moving top activity in a stack to pinned stack. 
* AMS.moveTopStackActivityToPinnedStack can be used to move the top
activity in a stack to the pinned stack and also specify the bounds
the pinned stack should be sized to.
* 'am stack move-top-activity-to-pinned-stack' command for testing
AMS.moveTopStackActivityToPinnedStack API

Bug: 25006507
Change-Id: I8392b4c39d8542153e691be7a627b7f35fd44884
 2015-10-26 12:07:00 -07:00
Geoff Mendal
e8be87e96f Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 4917e9dd1c  -s ours

* commit '4917e9dd1c727a003e9636e4c78c3f5c1aad7402':
  Import translations. DO NOT MERGE
 2015-10-26 19:06:53 +00:00
Geoff Mendal
6b3e7808d6 Import translations. DO NOT MERGE 
Change-Id: Ic500efe78e3dd02f8dd74b8c687443bbe559355b
Auto-generated-cl: translation import
 2015-10-26 12:06:21 -07:00
Geoff Mendal
76941becab Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 82b5276866  -s ours

* commit '82b52768667a16a6ef02b2d9aa9cd171f547331a':
  Import translations. DO NOT MERGE
 2015-10-26 19:04:39 +00:00
Geoff Mendal
48dfdda0e9 Import translations. DO NOT MERGE 
Change-Id: I07f75df116b723529d96cacf5ac8431caafb022d
Auto-generated-cl: translation import
 2015-10-26 12:04:18 -07:00
Geoff Mendal
79c07f4c63 Import translations. DO NOT MERGE 
Change-Id: I9ecfe0ecad2b5aa88fc4b60d6d5f8e718ec19bcf
Auto-generated-cl: translation import
 2015-10-26 12:02:09 -07:00
Geoff Mendal
8961b24ff2 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 18:59:41 +00:00
Geoff Mendal
4917e9dd1c Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 18:59:25 +00:00
Geoff Mendal
82b5276866 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 18:59:13 +00:00
Ben Kwa
d7915d2ab2 Fix a DocsUI crash due to a misnamed xml reference. 
BUG=25266394

Change-Id: I06bd3283e52467af3ebb43396d4166b3c25620a9
 2015-10-26 11:54:41 -07:00
Geoff Mendal
7ced195dd8 Import translations. DO NOT MERGE 
Change-Id: I8a0b74d374b31531c37be9b0d8bc251300a82009
Auto-generated-cl: translation import
 2015-10-26 11:49:23 -07:00
Geoff Mendal
db2cb7bb13 Import translations. DO NOT MERGE 
Change-Id: Ia70d07e17335f2a77a0c66ff9fb906e6f6f70171
Auto-generated-cl: translation import
 2015-10-26 11:43:00 -07:00
Phil Burk
908d5bc82e MIDI docs: add missing bracket 
The example code for openDevice() was missing a close bracket.

Bug: 25283941
Change-Id: I8fac6a6dee2393125ad4e057cb857fe21e43b491
Signed-off-by: Phil Burk <philburk@google.com>
 2015-10-26 11:41:11 -07:00
Geoff Mendal
30616cb825 Import translations. DO NOT MERGE 
Change-Id: I19a669e57b0264602c1daa8703caa8ac506a6cd7
Auto-generated-cl: translation import
 2015-10-26 11:40:53 -07:00
Tony Mantler
65cd70b7fb Merge "Move some app methods to AppUtils in SettingsLib" 2015-10-26 18:39:15 +00:00
Wale Ogunwale
99db1863a8 Added support for pinned stack. 
Used to support picture-in-picture use case for multi-window

Bug: 25006507
Change-Id: I3bef3f75e0c003f5974274294f1250171d424625
 2015-10-26 11:17:33 -07:00
Bryce Lee
1807cd15a1 Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev am: 521ac43fe5 am: 4c42942d53 
am: 1fd4da3b4f

* commit '1fd4da3b4f502adbe55e8340c3ec433f08ac89bd':
  Add Telecom config bool to require a phone account to be present for handle
 2015-10-26 17:39:15 +00:00
Bryce Lee
1fd4da3b4f Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev am: 521ac43fe5 
am: 4c42942d53

* commit '4c42942d539ee1ad3511b37d5f1d6e17da684103':
  Add Telecom config bool to require a phone account to be present for handle
 2015-10-26 17:30:07 +00:00
Geoff Mendal
cbecad4c6b Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 609444dff3 -s ours am: 65b9942a6c -s ours 
am: 31999bbbd0  -s ours

* commit '31999bbbd0af2165748c78be2c2786495b404f06':
  Import translations. DO NOT MERGE
 2015-10-26 17:23:06 +00:00
Bryce Lee
4c42942d53 Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev 
am: 521ac43fe5

* commit '521ac43fe581ee55fb8acf98bf52af622e03e9b1':
  Add Telecom config bool to require a phone account to be present for handle
 2015-10-26 17:18:14 +00:00
Filip Gruszczynski
c9ac4d0077 Merge "Fix recents <-> full screen animations in landscape." 2015-10-26 17:13:28 +00:00
Geoff Mendal
31999bbbd0 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 609444dff3 -s ours 
am: 65b9942a6c  -s ours

* commit '65b9942a6c381eda6433c1a679c6070144565d8a':
  Import translations. DO NOT MERGE
 2015-10-26 17:11:32 +00:00
Bryce Lee
521ac43fe5 Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev 2015-10-26 17:08:49 +00:00