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

9571 Commits

Author SHA1 Message Date
Dianne Hackborn
6fb1a7f53b am aa02bce2: am 56ae0447: am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev 
* commit 'aa02bce2f4acc57f2536cc41c2f0bf15498f6165':
  Add API level for MR1.
 2014-10-17 17:25:39 +00:00
Dianne Hackborn
bab9b48efc am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit '52476989b8afc0e96c2218625031ed550b12c79b':
  SDK only: hide the old L API version constant.
 2014-10-17 17:15:08 +00:00
Dianne Hackborn
3b6968876f Add API level for MR1. 
Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e
 2014-10-16 18:14:12 -07:00
Dianne Hackborn
d3511d4be1 SDK only: hide the old L API version constant. 
Also update the LOLLIPOP version constant to describe more things
that change when you target it.

Change-Id: I15e2c26a0f997ff2bfc8dd5076c827da7f42ee66
 2014-10-16 17:49:45 -07:00
Alan Viverette
3c72e618cc am 6950153f: am 205a5e69: am 8afc90fd: Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 
* commit '6950153f95fe7ebeddc1d6ed683fd596f8364f1f':
  Add style support to PopupMenu, clean up constructor javadoc
 2014-10-16 01:19:30 +00:00
Alan Viverette
8afc90fd71 Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 2014-10-16 00:44:36 +00:00
Alan Viverette
29632521c3 Add style support to PopupMenu, clean up constructor javadoc 
BUG: 18002523
Change-Id: Ice492686b814460248ccbe9727c64dd002e7ed7a
 2014-10-15 17:19:30 -07:00
Jay Shrauner
1518fc2244 am de4f8080: am 60841fcb: am 9e18d7ab: Merge "Remove unused onConferenceWith method" into lmp-mr1-dev 
* commit 'de4f8080f73b578a568a9ce6ea0920eafec1d714':
  Remove unused onConferenceWith method
 2014-10-15 21:05:52 +00:00
Jay Shrauner
2ec53ebbc6 Remove unused onConferenceWith method 
Never part of public API

Bug:17860628
Change-Id: Ib7c4f4c402bd29d82cc0b9e1f496496ea86efce1
 2014-10-15 11:48:04 -07:00
Dongwon Kang
ba766977f5 TIF: Define more cannonical genres in TvContract 
Background: while categorizing broadcast genres into cannonical genres,
it turned out that the existing 11 genres are not enough. 6 more genres
are added.

Bug: 17597747
Change-Id: I14c00771d69f1e30fc2c0e3978298c67066117e5
 2014-10-15 11:32:20 +09:00
Amith Yamasani
bc460b9c03 am d060a29e: am 6c0659e0: am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit 'd060a29e52fc73be53d643f74a9335652bd818ca':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-15 02:22:05 +00:00
Amith Yamasani
2079133871 am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '4bf0356ee2058c7f033a41e02fa3eb86909c450c':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-14 22:04:01 +00:00
Amith Yamasani
4bf0356ee2 am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '15a5f82f9b6b389614b1df78749bd627d97d5417':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-14 19:57:46 +00:00
Amith Yamasani
6d93491f50 Hide DISALLOW_OUTGOING_BEAM API 
This is not fully functional in managed profiles, so it is being removed for L.

Bug: 17973040
Change-Id: If660e5e565076cdf61649e9f5ca12877425e9df3
 2014-10-14 09:31:30 -07:00
Adam Lesinski
a5ebe01da3 am 557b8d7c: am bd1867e4: am 03be7ab5: am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '557b8d7cbdeaeeaaea792f6a85c74cfb34845e41':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-10 18:39:49 +00:00
Dianne Hackborn
d95f1c991c am 75a6e82b: am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '75a6e82bcc625025c5f48dc6c33d0dd469e9ca61':
  Put in real "code" (aka marketing) name.
 2014-10-10 05:41:19 +00:00
Adam Lesinski
03be7ab529 am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '6167950b7a5a8b9f021e9656b42b9b48bfbcbf80':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 16:57:34 +00:00
Adam Lesinski
6167950b7a am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 16:46:14 +00:00
Dianne Hackborn
d83e9e4280 am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:03:21 +00:00
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-09 00:14:54 +00:00
Adam Lesinski
59d208ddc1 Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-dev 2014-10-08 20:34:55 +00:00
Adam Lesinski
54e064bcea Remove UsageEvents#resetToStart() as it doesn't work 
After completely iterating over a UsageEvents object, the internal parcel
is recycled. If resetToStart is called then, it does nothing.

Bug:17909428
Change-Id: I7bc68d3429e4621a50dedbfc1789576d44dbb3be
 2014-10-08 12:33:16 -07:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Pete Gast
af6781dcfe Expand WearableExtender to customize labels. 
BUG: 15774526
Change-Id: I5796ab0e27975b5746d677be084b1ba1ada80a76
 2014-10-07 15:17:36 -04:00
Dianne Hackborn
22dbaddf58 am 8b718b80: am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '8b718b80e0caf179a174f8417fe4f5b875297de6':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:43:58 +00:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:22:53 +00:00
Dianne Hackborn
90d557b7a6 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:17:10 +00:00
Adam Powell
0e9ff5f4d5 am b6cdbcda: am 95891d26: am 00092db1: Fix build breakage in API check 
* commit 'b6cdbcda1b1f26b9367383a218d944e9d6b2e00d':
  Fix build breakage in API check
 2014-10-06 17:29:50 +00:00
Adam Powell
00092db1af Fix build breakage in API check 
Change-Id: I0fe7849b8b834fb32b13e60657685f72d1110d21
 2014-10-06 10:11:43 -07:00
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change 
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
 2014-10-03 16:26:04 -07:00
Ihab Awad
2f2021fe41 am f5db5392: am 53f7a44c: am 4cb7274d: Merge "Update api/current.txt" into lmp-mr1-dev 
* commit 'f5db539232b5f00b51205d823fbad001406a8c3a':
  Update api/current.txt
 2014-10-02 19:50:43 +00:00
Ihab Awad
463dcae219 Update api/current.txt 
Changes made in branch lmp-dev are @hide-den there but not here. When
they propagate downstream, we need to update api/current.txt.

Change-Id: Ic267f62391503d9acfb8451b16d5bb18035c948c
 2014-10-02 10:13:30 -07:00
Przemyslaw Szczepaniak
f0619add9e am a2722441: am 32c73663: am e8b3a391: am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit 'a2722441c06902f7a9781b1928a6c5952b196da6':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 15:29:22 +00:00
Sailesh Nepal
1c62b7b3a5 am 71e8654a: am 7043d948: am bdf84f29: Merge "Run update-api to fix build" into lmp-mr1-dev 
* commit '71e8654a6c4877a428911f96ee6f67d6cdc302bb':
  Run update-api to fix build
 2014-09-26 15:29:11 +00:00
Junda Liu
823db56f95 am 84bbc2fa: am b7a4acc3: am 4c5747ed: Update api/current.txt to unhide APIs by ag/554960 
* commit '84bbc2fa3e4ee41bb0220097ae9c4c4de44fcdf1':
  Update api/current.txt to unhide APIs by ag/554960
 2014-09-26 15:27:25 +00:00
Junda Liu
320ced0674 am 330bdf85: am 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev 
* commit '330bdf857fffdbf0e1c6d8e47dd36195eaff4f34':
  Revert "Hide CarrierPrivilege APIs in TelMgr."
 2014-09-26 15:26:59 +00:00
Ye Wen
2255f771f0 am 933ddd11: am f0df354b: am 272f2321: am a0945b40: resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev 
* commit '933ddd112f22d3f3de2b1297dcf418287d8d0643':
  Hide carrier app intents in Telephony (1/2)
 2014-09-26 15:25:49 +00:00
Junda Liu
5c65836f58 am 85764048: am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '8576404876fe609d74c26945fa4b5beb9a0edf96':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-26 15:25:43 +00:00
Przemyslaw Szczepaniak
16f5ec1207 am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit '8924617dd13785fa6285d5f9eb6fd20423077a73':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:31:04 +00:00
Przemyslaw Szczepaniak
d95788bf85 am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit 'f0a7c7672f158bc85ce400c1f59ec7fd973855d2':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:17:53 +00:00
Przemyslaw Szczepaniak
759962ab6d Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 2014-09-26 08:11:23 +00:00
Sailesh Nepal
57c4452e7b Run update-api to fix build 
Change-Id: Idfbf5aad2d693833bb3ac8ce77ad0331bd4f3613
 2014-09-25 18:46:45 -07:00
Junda Liu
8aa0aa538f Update api/current.txt to unhide APIs by ag/554960 
Bug: b/17639966
Change-Id: Ic11f362b170cf6fa16ce16a606c47f045bee9900
 2014-09-25 16:04:15 -07:00
Junda Liu
f52ac900ca Revert "Hide CarrierPrivilege APIs in TelMgr." 
This reverts commit b7aa9e4a6338811d4dacc77e6024a0b97a99e5e9.

Change-Id: I212cd4f1b7b45e0523fc47b2a9c2a6b487e9dbb5
 2014-09-25 18:56:11 +00:00
Ye Wen
ba049f7632 am a0945b40: resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev 
* commit 'a0945b409818052e8bc0e2a8711dbed6b2e56e33':
  Hide carrier app intents in Telephony (1/2)
 2014-09-25 18:27:55 +00:00
Ye Wen
7558bde120 resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev 
Change-Id: Ic27b03fa49bb921c36cd2825bf5486903dfd0317
 2014-09-25 11:20:08 -07:00
Junda Liu
cfac510914 am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '63f0b87ee3a0df19eec15e73cfbfb9b97623534c':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-25 18:17:52 +00:00
Junda Liu
cb6b5f9bd1 am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '96c548791145ab33ceb0935f38323d3182d44419':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-25 17:46:39 +00:00
Ye Wen
864a8b667a Merge "Hide carrier app intents in Telephony (1/2)" into lmp-dev 2014-09-25 17:36:32 +00:00
Junda Liu
698b3b2981 Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 2014-09-25 17:36:11 +00:00