LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,523 Commits 2 Branches 0 Tags
eb8c85f7c9b51b6a6f473e5746c1142da69a8f94
Commit Graph

18523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dake Gu
eb8c85f7c9 am 6b73c45d: Merge "Generate example of GuidedStepSupportFragment" into mnc-ub-dev 
* commit '6b73c45db3eed935144e69ca7a603dac128da0e9':
  Generate example of GuidedStepSupportFragment
 2015-09-23 01:29:23 +00:00
Dake Gu
6b73c45db3 Merge "Generate example of GuidedStepSupportFragment" into mnc-ub-dev 2015-09-23 01:22:18 +00:00
Dake Gu
8fc3a950e4 am 9e5a6a8f: Revert "Revert "Add example of vertical grid transition and GuidedStepFragment"" 
* commit '9e5a6a8fcbc9b5f6266dc757c97bce2bc6c5a721':
  Revert "Revert "Add example of vertical grid transition and GuidedStepFragment""
 2015-09-22 22:58:44 +00:00
Dake Gu
9e5a6a8fcb Revert "Revert "Add example of vertical grid transition and GuidedStepFragment"" 
This reverts commit c1e0465a05.
 2015-09-22 15:32:48 -07:00
David Pursell
da34785577 am ac2dfc34: am 54212f98: Merge "adb: fix install escaping test." 
* commit 'ac2dfc346df0dc73d87f0511cfb311341aadfe24':
  adb: fix install escaping test.
 2015-09-22 22:09:41 +00:00
David Pursell
ac2dfc346d am 54212f98: Merge "adb: fix install escaping test." 
* commit '54212f988146578dd014c42a8b1e66e98ab740e7':
  adb: fix install escaping test.
 2015-09-22 21:58:58 +00:00
David Pursell
54212f9881 Merge "adb: fix install escaping test." 2015-09-22 21:52:37 +00:00
David Pursell
9278d96e77 adb: fix install escaping test. 
The install escaping test fails if the device supports exit codes. This
fixes the test to ignore the exit code since we expect the install to
fail.

Change-Id: I37bb39552a6e9068ac088a25d831f45d81b28155
 2015-09-22 14:07:36 -07:00
David Pursell
3967e4861e am 14a29c0e: am 9f0ea756: Merge "adb: add tests for -Tt shell arguments." 
* commit '14a29c0ea427a7dbf990448faf53609e45da2eb9':
  adb: add tests for -Tt shell arguments.
 2015-09-22 20:38:59 +00:00
David Pursell
14a29c0ea4 am 9f0ea756: Merge "adb: add tests for -Tt shell arguments." 
* commit '9f0ea756e40e4f8dd7e0c2fe08cb56e7b4f8325a':
  adb: add tests for -Tt shell arguments.
 2015-09-22 20:31:28 +00:00
David Pursell
9f0ea756e4 Merge "adb: add tests for -Tt shell arguments." 2015-09-22 20:23:57 +00:00
David Pursell
d89fcd4f76 adb: add tests for -Tt shell arguments. 
Adds python tests to check that -T (disable PTY) and -t (force PTY)
arguments work as expected for `adb shell`.

Bug: http://b/23825231
Change-Id: I5343fae35b2be8459a9b95125f66def46c26adf4
 2015-09-22 12:50:39 -07:00
Dake Gu
de1b3fe04b am 56b56d0f: Merge "Revert "Add example of vertical grid transition and GuidedStepFragment"" into mnc-ub-dev 
* commit '56b56d0f5a896bbbb6d98952885a0b5b8184c1d6':
  Revert "Add example of vertical grid transition and GuidedStepFragment"
 2015-09-21 21:39:06 +00:00
Dake Gu
56b56d0f5a Merge "Revert "Add example of vertical grid transition and GuidedStepFragment"" into mnc-ub-dev 2015-09-21 21:23:52 +00:00
Dake Gu
c1e0465a05 Revert "Add example of vertical grid transition and GuidedStepFragment" 
This reverts commit 7b42f57cda.

Change-Id: Id6abde83749952818e39a5b4b61c923052aee569
 2015-09-21 21:23:41 +00:00
Dake Gu
1585785c23 Generate example of GuidedStepSupportFragment 
Bug: 21504593

Change-Id: Ifafc4a956060def75bc01d45eeb568d3077a977e
 2015-09-21 12:25:58 -07:00
Dake Gu
96780a6bb7 am fc169782: Merge "Add example of vertical grid transition and GuidedStepFragment" into mnc-ub-dev 
* commit 'fc169782398aba5fd6784ecfa3bed72b12e72de2':
  Add example of vertical grid transition and GuidedStepFragment
 2015-09-21 18:04:52 +00:00
Dake Gu
fc16978239 Merge "Add example of vertical grid transition and GuidedStepFragment" into mnc-ub-dev 2015-09-21 17:55:59 +00:00
Dan Albert
c94f4e4d0a am d95cc32a: am b02c99f0: Merge "Move python-adb from system/core/adb." 
* commit 'd95cc32a9bd9dc332f7286d967a7fe35eabeb5a4':
  Move python-adb from system/core/adb.
 2015-09-21 17:42:13 +00:00
Dan Albert
d95cc32a9b am b02c99f0: Merge "Move python-adb from system/core/adb." 
* commit 'b02c99f08684749f1a9960db3a78e12597693407':
  Move python-adb from system/core/adb.
 2015-09-21 17:34:32 +00:00
Dan Albert
b02c99f086 Merge "Move python-adb from system/core/adb." 2015-09-21 17:26:15 +00:00
Dan Albert
32e1307f45 Move python-adb from system/core/adb. 
This really ought to be maintained as a separate project. Also adds a
setup.py for distribution.

Bug: http://b/22881740
Change-Id: I8e11e4154fac21d3196a533613822b236b2b73e6
 2015-09-18 13:41:56 -07:00
Baligh Uddin
6ea64a65d2 am 70e49540: (-s ours) am 0544c15c: (-s ours) am 991947ef: (-s ours) Import translations. DO NOT MERGE 
* commit '70e495401e29ff89e1e385449dce02d4b0530ecb':
  Import translations. DO NOT MERGE
 2015-09-18 17:34:51 +00:00
Baligh Uddin
70e495401e am 0544c15c: (-s ours) am 991947ef: (-s ours) Import translations. DO NOT MERGE 
* commit '0544c15c4c21b477a478f03aa4c7e8622be922e9':
  Import translations. DO NOT MERGE
 2015-09-18 17:24:23 +00:00
Baligh Uddin
0544c15c4c am 991947ef: (-s ours) Import translations. DO NOT MERGE 
* commit '991947efccc5d6d6de9c21a9548a0ff143e51e84':
  Import translations. DO NOT MERGE
 2015-09-18 17:16:32 +00:00
Baligh Uddin
991947efcc Import translations. DO NOT MERGE 
Change-Id: I52f9e0ca4704f52015b44af909c18b966f03ff05
Auto-generated-cl: translation import
 2015-09-18 10:08:02 -07:00
Andreas Gampe
e3a344adaa am 94cae1e9: am 1ba0c94c: Merge "Development/scripts: Update stack tool" 
* commit '94cae1e977f37f8ade9f58e548817c6e68d5bc92':
  Development/scripts: Update stack tool
 2015-09-17 20:45:50 +00:00
Andreas Gampe
94cae1e977 am 1ba0c94c: Merge "Development/scripts: Update stack tool" 
* commit '1ba0c94c685f95ce829c40240069c382e7b6f30f':
  Development/scripts: Update stack tool
 2015-09-17 20:39:03 +00:00
Andreas Gampe
1ba0c94c68 Merge "Development/scripts: Update stack tool" 2015-09-17 20:28:30 +00:00
Andreas Gampe
57acd5f7da Development/scripts: Update stack tool 
The tool was broken for ASAN traces. Add a missing key to the
dictionary.

Bug: 24133462
Change-Id: I6e5b60441c9c602cd1381c1cb32947a1425c7069
 2015-09-17 11:44:21 -07:00
Yohann Roussel
eeaccc2291 am 03ae930a: am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk" 
* commit '03ae930a7382b0c58640449dd115d4fcc33970e6':
  Pick installed Jack & Jill for the sdk
 2015-09-15 07:46:21 +00:00
Yohann Roussel
03ae930a73 am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk" 
* commit '9e2e8392ae22051d775e093e6faba721d8b919eb':
  Pick installed Jack & Jill for the sdk
 2015-09-15 07:38:40 +00:00
Yohann Roussel
9e2e8392ae Merge "Pick installed Jack & Jill for the sdk" 2015-09-15 07:31:54 +00:00
Siva Velusamy
42cc98ea8c am a541aa65: resolved conflicts for 3f9d7b08 to stage-aosp-master 
* commit 'a541aa6559f314648153d0905445e3b256da3d42':
  platform tools version: replace alpha1 with rc1
 2015-09-15 00:22:26 +00:00
Siva Velusamy
a541aa6559 resolved conflicts for 3f9d7b08 to stage-aosp-master 
Change-Id: I3857d3ebdece7db356adfbc9b4f2ff3b1fc25825
 2015-09-14 17:14:28 -07:00
Siva Velusamy
3f9d7b0826 Merge "platform tools version: replace alpha1 with rc1" 2015-09-15 00:01:27 +00:00
Dake Gu
7b42f57cda Add example of vertical grid transition and GuidedStepFragment 
Added example of vertical grid transition

Added example of launching GuidedStepFragment from BrowseFragment.

Also fixed couple bug in GuidedStepActivity:
1. All fragment class should be public
2. Remove argument from constructor. Pass Arguments instead.

Bug: 23319507

Change-Id: Ia7b8d6669445be62f8f2a325cc460021ca392ded
 2015-09-14 16:09:33 -07:00
Siva Velusamy
a22f08db3a platform tools version: replace alpha1 with rc1 
The build scripts don't seem to accept alpha1 as the qualifier.
Earlier we've used rc1 so trying that.

Change-Id: I10c86fa2e727a840b8fdd16b3e7d3e311fb05831
 2015-09-14 14:56:06 -07:00
Siva Velusamy
f5ed55c37e resolved conflicts for 3ad4e29a to mnc-dr-dev-plus-aosp 
Change-Id: I03b93e109f0f6e6c0ded6bd7d6ebf0964f2d26ac
 2015-09-14 12:19:57 -07:00
Siva Velusamy
3ad4e29ac2 resolved conflicts for b1ead6e2 to stage-aosp-master 
Change-Id: I86c4af2fece33e94cf7fd8f3301f05a3fcdb642e
 2015-09-14 11:56:51 -07:00
Siva Velusamy
b1ead6e2de Merge "Update platform tools version to .1.0 alpha1" 2015-09-14 18:44:12 +00:00
Siva Velusamy
ad7321b975 Update platform tools version to .1.0 alpha1 
Change-Id: I6316ce33419d97e8a7138aa1db45f21af7c686e4
 2015-09-14 11:36:54 -07:00
Chris Banes
c2835b26eb am 8402e53c: Merge "Add snapping scroll example to SupportDesignDemos" into mnc-ub-dev 
* commit '8402e53c262cb4f8a18d883d5dabe8e8094dc68a':
  Add snapping scroll example to SupportDesignDemos
 2015-09-10 00:33:51 +00:00
Chris Banes
8402e53c26 Merge "Add snapping scroll example to SupportDesignDemos" into mnc-ub-dev 2015-09-10 00:25:10 +00:00
Tor Norbye
864403fa00 am 16d9874d: Update platform-tools version to 23.0.1 
* commit '16d9874d36785764fe1d73849f6d2ac2292063a4':
  Update platform-tools version to 23.0.1
 2015-09-09 19:09:12 +00:00
Tor Norbye
16d9874d36 Update platform-tools version to 23.0.1 
Change-Id: I7e2a9dd15793f3fde1be81b8eb987bc93746632e
 2015-09-09 18:56:49 +00:00
Mady Mellor
4cae3d4761 am 69bd278c: Add proguard configuration to support design demos sample app 
* commit '69bd278c0cb2cefe01e39ec9a8b12cb21222edb2':
  Add proguard configuration to support design demos sample app
 2015-09-09 18:44:46 +00:00
Dan Willemsen
a81bc96be3 am 033ea23f: am 7ad271e7: Merge "Update windows sdk to build non-recursively" 
* commit '033ea23f59f78e253affbc0d2745083339ca1fd7':
  Update windows sdk to build non-recursively
 2015-09-09 18:25:42 +00:00
Dan Willemsen
033ea23f59 am 7ad271e7: Merge "Update windows sdk to build non-recursively" 
* commit '7ad271e7742a904485c8fdf51206ba068bf5160f':
  Update windows sdk to build non-recursively
 2015-09-09 18:19:05 +00:00
Dan Willemsen
7ad271e774 Merge "Update windows sdk to build non-recursively" 2015-09-09 18:13:21 +00:00