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

220723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Xiaohui Chen
f5bf0de1aa clean up USER_OWNER in Pm command 
Change-Id: I3092cdf1ca619b4c1ba881955b8a55b97ba10e24
 2015-10-26 10:45:15 -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
John Reck
87566087c2 Merge "cleanup" 2015-10-26 17:06:49 +00:00
Geoff Mendal
65b9942a6c Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 609444dff3  -s ours

* commit '609444dff3df707589fb2b26e86338618618b871':
  Import translations. DO NOT MERGE
 2015-10-26 17:02:23 +00:00
Geoff Mendal
8d5d666355 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 14bb0511c6 -s ours am: 6995e0bf08 -s ours am: eeb2376185 -s ours 
am: b5e060ad63  -s ours

* commit 'b5e060ad63aec34e95b67f7632a2914b31fd2ca6':
  Import translations. DO NOT MERGE
 2015-10-26 17:01:01 +00:00
Julia Reynolds
79017f52f8 Merge "SystemUI: Reload the EndNowButton label" am: 40b52bbe48 am: c7839bde7c 
am: 537af1070b

* commit '537af1070b71919a76489881d3740bd55e1fb45a':
  SystemUI: Reload the EndNowButton label
 2015-10-26 16:59:25 +00:00
Geoff Mendal
2e134afb38 Import translations. DO NOT MERGE am: f6fc9e2152 -s ours am: 432eb8e686 -s ours am: 8b41305696 -s ours 
am: 5a33a869e3  -s ours

* commit '5a33a869e39b09d0b71835be65d39f7b1f80f458':
  Import translations. DO NOT MERGE
 2015-10-26 16:57:40 +00:00
Geoff Mendal
609444dff3 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 16:57:30 +00:00
John Reck
9564ff0baf cleanup 
Change-Id: I3b64e0af45f778c7d030c3c1a38c2103f91a4223
 2015-10-26 09:55:00 -07:00
Geoff Mendal
6b129a1e09 Import translations. DO NOT MERGE 
Change-Id: I3b8c2defeead0f1a68f261eaa271e7a316130627
Auto-generated-cl: translation import
 2015-10-26 11:53:50 -05:00
Geoff Mendal
b5e060ad63 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 14bb0511c6 -s ours am: 6995e0bf08 -s ours 
am: eeb2376185  -s ours

* commit 'eeb237618544f1fda2fffacc85a6edb8e5405cb8':
  Import translations. DO NOT MERGE
 2015-10-26 16:50:36 +00:00
Geoff Mendal
eeb2376185 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 14bb0511c6 -s ours 
am: 6995e0bf08  -s ours

* commit '6995e0bf0815ec9b0eab8b3630d28f289475057c':
  Import translations. DO NOT MERGE
 2015-10-26 16:43:51 +00:00
Geoff Mendal
6995e0bf08 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
am: 14bb0511c6  -s ours

* commit '14bb0511c6cc5ad62a870b3c2437c8090bcf75af':
  Import translations. DO NOT MERGE
 2015-10-26 16:33:36 +00:00
Geoff Mendal
14bb0511c6 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-26 16:28:12 +00:00
Geoff Mendal
a03cd002b3 Merge "Import translations. DO NOT MERGE" 2015-10-26 16:27:21 +00:00
Geoff Mendal
7afd89dfbb Import translations. DO NOT MERGE 
Change-Id: I0383c1869f289a39ca3db684712dbd812e626e9a
Auto-generated-cl: translation import
 2015-10-26 11:27:14 -05:00
Geoff Mendal
8c682c6c49 Import translations. DO NOT MERGE 
Change-Id: If16d9ce42e80f3b4961d7d7e878870718ad0806b
Auto-generated-cl: translation import
 2015-10-26 11:14:49 -05:00
Paul Jensen
b6d8f81b10 Merge "Remove dead ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN" 2015-10-26 15:15:33 +00:00
Julia Reynolds
537af1070b Merge "SystemUI: Reload the EndNowButton label" am: 40b52bbe48 
am: c7839bde7c

* commit 'c7839bde7cd8ed21326208b17030c87e8bf206c9':
  SystemUI: Reload the EndNowButton label
 2015-10-26 15:15:24 +00:00
Julia Reynolds
c7839bde7c Merge "SystemUI: Reload the EndNowButton label" 
am: 40b52bbe48

* commit '40b52bbe480436fbdc3bfb8a1a70c6144e71ff8f':
  SystemUI: Reload the EndNowButton label
 2015-10-26 15:05:34 +00:00
Julia Reynolds
40b52bbe48 Merge "SystemUI: Reload the EndNowButton label" 2015-10-26 14:57:34 +00:00
Johan Redestig
f2d824fd56 SystemUI: Reload the EndNowButton label 
Reload the EndNowButton label when configuration
changes.

Change-Id: I042d31f0bb011996aa8219c3c412e7b71987244c
 2015-10-26 15:51:23 +01:00
Geoff Mendal
5a33a869e3 Import translations. DO NOT MERGE am: f6fc9e2152 -s ours am: 432eb8e686 -s ours 
am: 8b41305696  -s ours

* commit '8b41305696055296016e57c82520eeac9c2a57d4':
  Import translations. DO NOT MERGE
 2015-10-26 14:50:48 +00:00