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

142063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Egberts
931a0e27e1 Merge "Remove Markup and Utterance classes." 2014-07-09 19:47:58 +00:00
Yuncheol Heo
eeba0257a7 Tag hole-punching api with @SystemApi. 
Change-Id: I50c27c32abd7e6d2404c451fb53cfb1379b88e00
 2014-07-10 20:03:57 +09:00
Yuncheol Heo
e9b9b1e784 Verify the CEC message source and the destination. 
- Depending on the message type, the direct destination or the broadcast
  destination can't be used, and neither the unregistered source can be
  allowed.

Change-Id: I7fe2151025afbf155ae663331d5d97d4910c4a98
 2014-07-10 19:38:04 +09:00
Sailesh Nepal
3e9090524a Merge "Add Connection.setCallCapabilities" 2014-07-09 21:34:29 +00:00
Sailesh Nepal
1a7061ba95 Add Connection.setCallCapabilities 
This will be used to enable things like hold and
conferencing.

Change-Id: I90238eeefbcbfaa044881d80833b62e4474821d6
 2014-07-09 23:20:41 -07:00
Adam Powell
4f6c2050a8 ResolverDrawerLayout for ResolverActivity 
Internal widget to allow nested scrolling of the grid of intent filter
targets. Initial logic complete.

Bug 15694906

Change-Id: Ib19723146bf1722db6bdd68f95cc6e623462d0f0
 2014-07-09 23:16:15 -07:00
Stephen Hines
770a6cafad am 0bf5cfc0: am 8348c351: am 4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects." 
* commit '0bf5cfc0b3e10265e47920d6ed5b65f94a5a178a':
  Update copyFrom(BaseObj[]) for large objects.
 2014-07-10 00:50:12 +00:00
Elliott Hughes
5430d3a4c9 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-07-10 00:43:07 +00:00
Elliott Hughes
e8e968a7c6 am 583a845c: am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu." 
* commit '583a845c6eb6308d7ada72cb0e91444efc91cc54':
  Switch frameworks/base/libs/androidfw to the new icu.
 2014-07-10 00:42:48 +00:00
Elliott Hughes
b58d385e17 resolved conflicts for merge of f6be5a7a to master 
Change-Id: I6dcfb33981df90877fb9f3752b853cf377633edf
 2014-07-09 17:40:24 -07:00
Stephen Hines
0bf5cfc0b3 am 8348c351: am 4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects." 
* commit '8348c35165001cdb16c73f077be257f653392535':
  Update copyFrom(BaseObj[]) for large objects.
 2014-07-10 00:21:50 +00:00
Robert Ly
051a3204d4 am 10c286d6: am cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev 
* commit '10c286d657c93c8b80b8d336661569256749f39e':
  Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"
 2014-07-10 00:19:56 +00:00
Stephen Hines
8348c35165 am 4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects." 
* commit '4fea742c07d2d55f29b7d61078914c5f83817313':
  Update copyFrom(BaseObj[]) for large objects.
 2014-07-10 00:16:44 +00:00
Elliott Hughes
583a845c6e am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu." 
* commit '3964ea46750cd5715f29ad4d9cada4a35208ad7a':
  Switch frameworks/base/libs/androidfw to the new icu.
 2014-07-10 00:16:43 +00:00
Elliott Hughes
f6be5a7ac8 am f072fda1: am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu." 
* commit 'f072fda13fd47d7dc7246cb821a26990d8fb271f':
  Switch frameworks/base/core/jni to the new icu.
 2014-07-10 00:16:29 +00:00
Robert Ly
10c286d657 am cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev 
* commit 'cc2af1c010ae896ef6aea7c428876ea5d9a7dc73':
  Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"
 2014-07-10 00:11:33 +00:00
Elliott Hughes
3964ea4675 am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu." 
* commit 'd74f99d390d9a0e1c800ee68b1bc39c210aca989':
  Switch frameworks/base/libs/androidfw to the new icu.
 2014-07-10 00:08:33 +00:00
Elliott Hughes
f072fda13f am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu." 
* commit 'effcc83e42638a5fa7eceaebe22081a1b9eaebaf':
  Switch frameworks/base/core/jni to the new icu.
 2014-07-10 00:08:29 +00:00
Quddus Chong
8e086faf89 am 9afee0df: docs: Added missing instructions for copying the Google Play Services library project. 
* commit '9afee0df49ce019bf8c8d1c7dc15857949637ccf':
  docs: Added missing instructions for copying the Google Play Services library project.
 2014-07-09 23:02:01 +00:00
Quddus Chong
9afee0df49 docs: Added missing instructions for copying the Google Play Services library project. 
Change-Id: I04bbfce7e3901a1aa14a3c2a273674014c60ae17
 2014-07-09 15:49:17 -07:00
Elliott Hughes
effcc83e42 Merge "Switch frameworks/base/core/jni to the new icu." 2014-07-09 22:27:32 +00:00
Elliott Hughes
92b1896dfd Switch frameworks/base/core/jni to the new icu. 
Change-Id: Id12ce02da377ce78f318e10633c47f500237d9d9
 2014-07-09 16:56:11 -07:00
Dianne Hackborn
24f06d2440 Merge "Get rid of security exception spam during boot." 2014-07-09 22:27:31 +00:00
Dianne Hackborn
ddef7e776b Get rid of security exception spam during boot. 
Change-Id: If7a516e463722280bf597f7dd601e7a0f6e379c8
 2014-07-09 17:41:47 -07:00
Robert Ly
0d15ec7828 am d7880b6a: docs: fix packaging instructions again to reflect correct metadata name 
* commit 'd7880b6a50aa0dbea66923a4672d360229ab3aca':
  docs: fix packaging instructions again to reflect correct metadata name
 2014-07-09 19:19:54 +00:00
Robert Ly
d7880b6a50 docs: fix packaging instructions again to reflect correct metadata name 
Change-Id: I61659811065ad5f0fa8f722f80793e707730604c
 2014-07-09 12:13:27 -07:00
Ricardo Cervera
811aeae953 am e34167ce: Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev 
* commit 'e34167cef73e23c4be4bf5d7a1517e609122d652':
  docs: Fixed minor issues with Wear docs. Bug: 16062631
 2014-07-09 18:38:20 +00:00
Ricardo Cervera
941fe57735 am 3a958b9f: docs: Fixed nav bar color in material docs. Bug: 16160906 
* commit '3a958b9f851a8985bed5fac1499c5553ff566b9e':
  docs: Fixed nav bar color in material docs. Bug: 16160906
 2014-07-09 18:38:16 +00:00
Robert Ly
fdefaadab5 am a0d38aa4: Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev 
* commit 'a0d38aa4e58eee27b561420047d0aafcdaed93f1':
  docs: remove gms core preview for wear and redirect
 2014-07-09 18:33:49 +00:00
Ricardo Cervera
3a958b9f85 docs: Fixed nav bar color in material docs. Bug: 16160906 
Change-Id: I56eb7f4d0e9a0a24b1fb38f08dd8ccba6c91dd17
 2014-07-09 11:32:40 -07:00
Robin Lee
06505d234d am 1f0180bf: am 74803e55: Merge "Make misc config directory during user creation" 
* commit '1f0180bfa877373b239a5675f715288db829fa75':
  Make misc config directory during user creation
 2014-07-09 17:43:56 +00:00
Robin Lee
1f0180bfa8 am 74803e55: Merge "Make misc config directory during user creation" 
* commit '74803e559caffe235b86dc52cf76ef98343c0d74':
  Make misc config directory during user creation
 2014-07-09 17:39:13 +00:00
Robert Ly
fff6fdbf57 am 33f5a318: Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev 
* commit '33f5a318b981a69542bfd158e3fec5814135665a':
  docs: surface ui toolkit at a higher level
 2014-07-09 16:50:42 +00:00
Robert Ly
2d3fca2490 am db520137: Merge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev 
* commit 'db520137dbd67d4b8ec65011accadda7e25ec844':
  docs: fix wear packaging for paid apps instructions
 2014-07-09 16:28:29 +00:00
Robert Ly
41d6cc1b8e am e0b5829e: Merge "docs: fix 2d picker image description" into klp-modular-dev 
* commit 'e0b5829eb1eac1be768343371da71e7d53d9eff5':
  docs: fix 2d picker image description
 2014-07-09 15:51:13 +00:00
Robert Ly
9a529d1b31 am 6f52e7be: Merge "docs: fix link to messages doc" into klp-modular-dev 
* commit '6f52e7be188781a906cc53dcd96268ffbfdfc283':
  docs: fix link to messages doc
 2014-07-09 15:06:37 +00:00
Ricardo Cervera
e34167cef7 Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev 2014-07-09 14:50:26 +00:00
Ricardo Cervera
4adf1e069b docs: Fixed minor issues with Wear docs. Bug: 16062631 
Change-Id: Ieaa02cfedd1b9b6f59c6937a056c8d4f4eb4188e
 2014-07-09 11:30:23 -07:00
Robert Ly
a0d38aa4e5 Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev 2014-07-09 14:50:26 +00:00
Robert Ly
fa813cebaa docs: remove gms core preview for wear and redirect 
Change-Id: I8dd618a8fc99034cd73927d4aa312fe871081f83
 2014-07-09 09:46:45 -07:00
Robert Ly
1d5393298b docs: surface ui toolkit at a higher level 
Change-Id: If17cebda4606404f13d10ecb1540eda75b5e11ec
 2014-07-09 09:42:29 -07:00
Robert Ly
6d36bbe11b docs: fix wear packaging for paid apps instructions 
Change-Id: Ibf2cbe2e4bcb7e998665b10c5632c786dcc90e76
 2014-07-09 09:23:23 -07:00
Robert Ly
106ecfdca7 docs: fix 2d picker image description 
Change-Id: Id554a7090986e71a502dc070468d26f8d546cc2c
 2014-07-09 08:46:37 -07:00
Robert Ly
546d0ba888 docs: fix link to messages doc 
Change-Id: I382a2ec26634f8d7427344657de0a66b187562cb
 2014-07-09 07:59:07 -07:00
Stephen Hines
4fea742c07 Merge "Update copyFrom(BaseObj[]) for large objects." 2014-07-09 14:45:53 +00:00
Tim Murray
31e12acca5 Update copyFrom(BaseObj[]) for large objects. 
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
 2014-07-09 17:09:33 -07:00
Elliott Hughes
d74f99d390 Merge "Switch frameworks/base/libs/androidfw to the new icu." 2014-07-09 14:45:53 +00:00
Elliott Hughes
6a4deeda70 Switch frameworks/base/libs/androidfw to the new icu. 
Change-Id: Id82830750dd7e83bbc66811a1133b403cc697c97
 2014-07-09 16:58:28 -07:00
Tim Murray
91758a3946 Merge "Update copyFrom(BaseObj[]) for large objects." 2014-07-09 14:43:38 +00:00
Tim Murray
3de3dc79e5 Update copyFrom(BaseObj[]) for large objects. 
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
 2014-07-09 15:30:42 -07:00