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

15381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
2e15d6e86b am 0911ea8d: Merge "API Review: change SharedElementListener to SharedElementCallback" into lmp-dev 
* commit '0911ea8db7c60a45fdfeb98f1bbf1e09e5d6d7e4':
  API Review: change SharedElementListener to SharedElementCallback
 2014-09-05 17:07:59 +00:00
George Mount
0911ea8db7 Merge "API Review: change SharedElementListener to SharedElementCallback" into lmp-dev 2014-09-05 13:55:45 +00:00
Ye Wen
279d27738d am d6ef9163: MMS API cleanup (4/4) 
* commit 'd6ef9163ed0e7c1824ee5b6c9ff2f556ef652aa3':
  MMS API cleanup (4/4)
 2014-09-04 23:57:36 +00:00
George Mount
00fc6d9b06 API Review: change SharedElementListener to SharedElementCallback 
Bug 17289526

Change-Id: I5d28a77d870b83cc93483be23635bc669978cefc
 2014-09-04 15:41:53 -07:00
Ye Wen
d6ef9163ed MMS API cleanup (4/4) 
- Hide APIs not approved by API council (b/17189780)
- Change configOverrides in MMS APIs from ContentValues to Bundle to be
consistent (b/17390017)
- Change SmsManager.MMS_EXTRA_DATA to EXTRA_MMS_DATA per API council
review (b/17390977)

b/17189780
b/17390017
b/17390977

Change-Id: Id9ae09ae4ef083186b93677ffabf5640c54aa99d
 2014-09-04 15:41:13 -07:00
Andrew Hsieh
54c9ab473c am 35086b3b: am 45b3c498: Merge "Add required permission to sample code" 
* commit '35086b3b8bb076e15539c6a7245d4ccd9c68a7ce':
  Add required permission to sample code
 2014-09-04 19:59:56 +00:00
Andrew Hsieh
35086b3b8b am 45b3c498: Merge "Add required permission to sample code" 
* commit '45b3c498c4bc78e9949fedd1dc4ce4fdb7cea340':
  Add required permission to sample code
 2014-09-04 19:48:30 +00:00
Andrew Hsieh
45b3c498c4 Merge "Add required permission to sample code" 2014-09-04 19:40:40 +00:00
Marco Nelissen
f6d2ae9279 Add required permission to sample code 
Bug: 15014196
Change-Id: I0edf8320e9eaa02031d564735c17c016d7e14fda
 2014-09-04 11:21:03 -07:00
Andrew Hsieh
3b4aacc247 am dfaca9ff: am 61b90c04: Merge "Refresh 64-bit headers/libs (WW36)" 
* commit 'dfaca9ff769b05fb66dd1a56861ddb41c98381b0':
  Refresh 64-bit headers/libs (WW36)
 2014-09-04 18:18:48 +00:00
Andrew Hsieh
dfaca9ff76 am 61b90c04: Merge "Refresh 64-bit headers/libs (WW36)" 
* commit '61b90c04ede2ddf741f43ff279c5684bfc95d634':
  Refresh 64-bit headers/libs (WW36)
 2014-09-04 18:04:44 +00:00
Andrew Hsieh
25201b2de1 am a3dcb3f2: am 811fc430: Merge "Update android-L/include/android" 
* commit 'a3dcb3f229459b72af97eb7968ef2afee31d9ce0':
  Update android-L/include/android
 2014-09-04 17:59:30 +00:00
Andrew Hsieh
61b90c04ed Merge "Refresh 64-bit headers/libs (WW36)" 2014-09-04 17:57:44 +00:00
Andrew Hsieh
a3dcb3f229 am 811fc430: Merge "Update android-L/include/android" 
* commit '811fc430bbde6f67fe71c108ca9ad4d683cc9183':
  Update android-L/include/android
 2014-09-04 17:46:07 +00:00
Andrew Hsieh
811fc430bb Merge "Update android-L/include/android" 2014-09-04 17:36:36 +00:00
Andrew Hsieh
3f53b6f2fe Refresh 64-bit headers/libs (WW36) 
sync to lmp-dev/bionic 1e010d60397db706cd3d1c4d5701a2bced441aa8

Change-Id: Ieed39d41eb0655d7c8f027bd038be1753a9e56a6
 2014-09-03 22:36:28 -07:00
Yigit Boyar
444f7e7cf3 am 319a2029: Merge "SupportV7 Navigation Bar Demo" into lmp-dev 
* commit '319a20297d4926ac3641302f81c31028a43968a2':
  SupportV7 Navigation Bar Demo
 2014-09-03 23:48:48 +00:00
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
Yigit Boyar
319a20297d Merge "SupportV7 Navigation Bar Demo" into lmp-dev 2014-09-03 22:14:11 +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
Yigit Boyar
98f71019b1 SupportV7 Navigation Bar Demo 
Change-Id: I4347762a621a887ccac03372071abac5b56b52f3
 2014-08-29 15:31:39 -07: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
Andrew Hsieh
c7f04c38a0 Update android-L/include/android 
Added more constants, and 6 new sensor functions

Change-Id: I0b8a028ec948ba66074e949bc20435cb05845a80
 2014-08-28 14:29:28 +08: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