LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,361 Commits 2 Branches 0 Tags
e255ed875ca2d6d59170edce05e45307cb0ffbf9
Commit Graph

15361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Odell
e255ed875c am 9b00ec91: Bug 17262099: MMS API changes (multi-project). 
* commit '9b00ec9132fc426c7787c70546f84779e62cf3d2':
  Bug 17262099: MMS API changes (multi-project).
 2014-09-03 23:47:08 +00:00
Julian Odell
9b00ec9132 Bug 17262099: MMS API changes (multi-project). 
Change API demo to use new content provider based MMS API.
Rebased and merged with TOT.

Change-Id: Ia1b815f2904ccfc9962960369f85e1f2de830927
 2014-09-03 13:13:33 -07:00
George Mount
96729f2a49 am 91df7895: Merge "Changed attribute name." into lmp-dev 
* commit '91df78959530874471bcd2bb931fd9d77711698a':
  Changed attribute name.
 2014-09-03 15:38:40 +00:00
George Mount
91df789595 Merge "Changed attribute name." into lmp-dev 2014-09-03 14:21:37 +00:00
Marco Nelissen
caa3bc3c90 am 5c8a816e: Merge "Add required permission to sample code" into lmp-dev 
* commit '5c8a816e781753215be279986764dcdc4dd26b3f':
  Add required permission to sample code
 2014-09-02 21:19:35 +00:00
Marco Nelissen
5c8a816e78 Merge "Add required permission to sample code" into lmp-dev 2014-09-02 20:58:05 +00:00
Marco Nelissen
486a53c016 Add required permission to sample code 
Bug: 15014196
Change-Id: I0edf8320e9eaa02031d564735c17c016d7e14fda
 2014-09-02 12:08:48 -07:00
George Mount
bdb8e21e40 Changed attribute name. 
Bug 17188255

Change-Id: I8d5cbcd7e67ea62aeb19ca8d5652f47cafb70d3a
 2014-08-31 16:03:28 -07:00
Elliott Hughes
99c64a26fd am 6b9a4ef2: am 72bd0479: Merge "Make \'stack\' able to find toolchains regardless of lunch." 
* commit '6b9a4ef217303018e44fcdfd67ec3e7395ec80b2':
  Make 'stack' able to find toolchains regardless of lunch.
 2014-08-29 22:51:54 +00:00
Elliott Hughes
6b9a4ef217 am 72bd0479: Merge "Make \'stack\' able to find toolchains regardless of lunch." 
* commit '72bd04795b38b8dbbbf5d4b6e8c5cac2a4322702':
  Make 'stack' able to find toolchains regardless of lunch.
 2014-08-29 22:38:47 +00:00
Elliott Hughes
72bd04795b Merge "Make 'stack' able to find toolchains regardless of lunch." 2014-08-29 22:29:43 +00:00
Elliott Hughes
c3c8619579 Make 'stack' able to find toolchains regardless of lunch. 
This is needed by the internal stack decoding website, which
will be pulling symbols from the build servers anyway (so doesn't
need to be correctly lunched).

Bug: 16734486
Change-Id: I9190065148c0d4bb4eacec28bcc062fa95798917
 2014-08-29 13:49:57 -07:00
Alan Viverette
63fe7fe306 am fe3ba7fb: Add device default light and dark dialogs to ApiDemos 
* commit 'fe3ba7fbc9177fe185a16ec11723b8e740bb7649':
  Add device default light and dark dialogs to ApiDemos
 2014-08-29 18:48:02 +00:00
Alan Viverette
fe3ba7fbc9 Add device default light and dark dialogs to ApiDemos 
Change-Id: I538c2cfb975828cd0e1e065d4cf5589e573307d5
 2014-08-28 16:39:27 -07:00
Jim Miller
8a9f9701d8 am b52c7ae8: Merge "Revert "Add test options for DPM.setTrustAgentFeaturesEnabled()" until the new API is ready. This reverts commit d6df7362ab4b332a09d12358297056cfeadcaa11." into lmp-dev 
* commit 'b52c7ae862bb5e990ca6447e02833c2b5eba78fb':
  Revert "Add test options for DPM.setTrustAgentFeaturesEnabled()" until the new API is ready. This reverts commit d6df7362ab.
 2014-08-27 21:48:53 +00:00
Jim Miller
b52c7ae862 Merge "Revert "Add test options for DPM.setTrustAgentFeaturesEnabled()" until the new API is ready. This reverts commit d6df7362ab4b332a09d12358297056cfeadcaa11." into lmp-dev 2014-08-27 21:26:14 +00:00
Jim Miller
ac48e8f5e3 Revert "Add test options for DPM.setTrustAgentFeaturesEnabled()" until the new API is ready. 
This reverts commit d6df7362ab.

Change-Id: Ie5c8e139450923374d235ea9d85f015b87851d06
 2014-08-27 21:25:16 +00:00
Jeff Hao
47a3e7f1d0 am 016fc167: Update call to IActivityManager.startActivity. 
* commit '016fc167aca1f31aa0b151e1312408fcaa9bf9b6':
  Update call to IActivityManager.startActivity.
 2014-08-26 23:25:51 +00:00
Leandro Gracia Gil
0d6c5e8ec6 am c32e9081: am 4123e088: Merge "Add the protobuf compiler binary to the Windows SDK build." 
* commit 'c32e90813965eab51f1494cfabb9d3457c938d85':
  Add the protobuf compiler binary to the Windows SDK build.
 2014-08-26 19:19:37 +00:00
Leandro Gracia Gil
c32e908139 am 4123e088: Merge "Add the protobuf compiler binary to the Windows SDK build." 
* commit '4123e0886b69fd7ecb91abe1c4ac9bfca1de52e7':
  Add the protobuf compiler binary to the Windows SDK build.
 2014-08-26 19:09:34 +00:00
Leandro Gracia Gil
4123e0886b Merge "Add the protobuf compiler binary to the Windows SDK build." 2014-08-26 18:53:23 +00:00
Jeff Hao
016fc167ac Update call to IActivityManager.startActivity. 
Multi-project change to go with
https://googleplex-android-review.git.corp.google.com/529286

Bug: 17040932
Change-Id: I7fa018213acd71bc0f63c97399a1676bbde61d44
 2014-08-26 09:59:36 -07:00
Raphael Moll
14b1fa686c am 26c34d44: resolved conflicts for merge of 85074d06 to lmp-dev 
* commit '26c34d447d7bcf0e05b560d02320b7cb22dab06c':
  Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
 2014-08-26 04:57:01 +00:00
Raphael Moll
26c34d447d resolved conflicts for merge of 85074d06 to lmp-dev 
Change-Id: I96b3e879893982d9324386336710d8ea11f4796c
 2014-08-25 18:48:39 -07:00
Stephen Hines
73facdb52b am 9cad7669: am 6d884d6c: Merge "Fix RS samples to prepare for 64-bit compilation." 
* commit '9cad7669180608ceff6f3d8c2042d942933c8082':
  Fix RS samples to prepare for 64-bit compilation.
 2014-08-23 00:12:28 +00:00
Stephen Hines
9cad766918 am 6d884d6c: Merge "Fix RS samples to prepare for 64-bit compilation." 
* commit '6d884d6cb304e14e380ba501abe868cfaea97426':
  Fix RS samples to prepare for 64-bit compilation.
 2014-08-22 23:58:35 +00:00
Stephen Hines
6d884d6cb3 Merge "Fix RS samples to prepare for 64-bit compilation." 2014-08-22 23:27:39 +00:00
Dianne Hackborn
fa3ff82ea9 am 717280c7: Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 
* commit '717280c7c126b7d09ef9f61193798c63c9e8db0b':
  Work on issue #17011123: Hit Back/Recents button when in Recents...
 2014-08-22 20:26:58 +00:00
Dianne Hackborn
717280c7c1 Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 2014-08-22 20:05:50 +00:00
Raphael Moll
85074d06aa am 18ec7c4f: resolved conflicts for merge of 566a4694 to klp-modular-dev 
* commit '18ec7c4f8a8d1780fa80f0ab21e484576c775fe4':
  Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
 2014-08-22 18:44:54 +00:00
Raphael Moll
18ec7c4f8a resolved conflicts for merge of 566a4694 to klp-modular-dev 
Change-Id: I04c6c2fdff66e5e82f5f99cc629f9eaa5725ef26
 2014-08-22 11:26:33 -07:00
Raphael Moll
566a46941e am 76c7aa35: Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE. 
* commit '76c7aa353666479df9545a66f3f49eb8ff69a86e':
  Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
 2014-08-22 16:53:16 +00:00
Stephen Hines
73ae6d9f02 Fix RS samples to prepare for 64-bit compilation. 
Bug: 16031597
Change-Id: I8f79773e4d5219d3c8dc4696176cd42f8236c87b
(cherry picked from commit d8295c9e49)
 2014-08-22 01:16:21 -07:00
Raphael Moll
76c7aa3536 Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE. 
Change-Id: I140d043086c8da434a8b6bf16cfb3c3763e2ba89
 2014-08-22 04:28:39 +00:00
Dianne Hackborn
9f744759d1 Work on issue #17011123: Hit Back/Recents button when in Recents... 
...without interacting with any of the Recents items should not
bring Home back to top

Add API demo for nav bar navigation.

Change-Id: I8b45f2bc0b554da19957ad723abe7cf4a14ee5a1
 2014-08-21 17:58:05 -07:00
Stephen Hines
a9d1cd0d32 am d6a790cd: Merge "Fix RS samples to prepare for 64-bit compilation." into lmp-dev 
* commit 'd6a790cdfef3aa0c16264c6a2c37e0164dde8d04':
  Fix RS samples to prepare for 64-bit compilation.
 2014-08-21 22:13:21 +00:00
Stephen Hines
d6a790cdfe Merge "Fix RS samples to prepare for 64-bit compilation." into lmp-dev 2014-08-21 21:49:56 +00:00
Craig Stout
a58523591c am 311be185: Demonstrate OnItemClicked/Selected listeners. 
* commit '311be185b2a1223c5936429c3f22ad4ad6fcdd56':
  Demonstrate OnItemClicked/Selected listeners.
 2014-08-21 20:31:50 +00:00
Craig Stout
311be185b2 Demonstrate OnItemClicked/Selected listeners. 
Also fixes broken VerticalGridFragment.
And cleanup.

b/16354712

Change-Id: I348ab42230d88bac8192b5421e76a58b28ca6616
 2014-08-20 18:26:44 -07:00
Tom Taylor
0dcc306dff am f1c2891a: Merge "MMS API: ApiDemos demo app" into lmp-dev 
* commit 'f1c2891a0029cca137ba3b7802e75e21d500788c':
  MMS API: ApiDemos demo app
 2014-08-20 19:21:58 +00:00
Tom Taylor
f1c2891a00 Merge "MMS API: ApiDemos demo app" into lmp-dev 2014-08-20 18:43:12 +00:00
Dake Gu
efac7ff378 am 17b507bd: Merge "Make BrowseAnimationFragment working" into lmp-dev 
* commit '17b507bd0c1c4a999124b3d2ff81411fc879e13f':
  Make BrowseAnimationFragment working
 2014-08-19 21:07:50 +00:00
Craig Stout
7dd382febc am 114c29f2: Merge "Cleanup playback controls sample." into lmp-dev 
* commit '114c29f2276cc0eda6542eed46336df35e2a66fc':
  Cleanup playback controls sample.
 2014-08-19 17:53:37 +00:00
Ying Wang
639e4bc61f am 67f00d44: am 7ec230ea: Merge "Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree." 
* commit '67f00d4487575c5690f1939289665caa79aa3120':
  Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
 2014-08-19 17:07:48 +00:00
Ying Wang
67f00d4487 am 7ec230ea: Merge "Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree." 
* commit '7ec230eaf2a35e98bdb28da92feecf7476eb0a33':
  Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
 2014-08-19 17:01:50 +00:00
Ying Wang
5092d393b5 am e522c95f: Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree. 
* commit 'e522c95f8f76277624e6758864501c4ad4a167d2':
  Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
 2014-08-19 16:48:49 +00:00
Ying Wang
7ec230eaf2 Merge "Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree." 2014-08-19 15:49:56 +00:00
Ying Wang
00b44e517b Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree. 
Bug: 17105204
Change-Id: I80dcad8198926dd0b758d65bd8704eb4c6b39e8d
 2014-08-19 09:33:45 -07:00
Dake Gu
17b507bd0c Merge "Make BrowseAnimationFragment working" into lmp-dev 2014-08-18 21:31:41 +00:00
Dake Gu
f2204d4af7 Make BrowseAnimationFragment working 
Change-Id: Id239c1910783bb70cbffcba71a5832a15db58e39
 2014-08-18 16:14:50 -07:00