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

154457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
727cae197b Mutate and apply theme if needed before caching themed drawables 
This ensures that drawables are completely separated from their cached
constant states before applying a theme. After this, we can remove the
implicit (and incomplete) mutation in the clone constructors.

Also implements missing mutate() method on ClipDrawable.

BUG: 17646144
Change-Id: If0d66b0a85724d76e0a4f506758c7ba3c0aa3410
 2014-10-07 15:08:47 -07:00
Jinsuk Kim
84659edd41 Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev 2014-10-06 23:48:20 +00:00
Jinsuk Kim
ad515e88ee CEC: Send <Device Vendor ID> after address allocation 
This is required to pass CTS 11.2.9-2.

Bug: 17882288

Change-Id: Ie2823be8635a458a63a95abd44135035667d5836
 2014-10-06 23:47:52 +00:00
Geoff Mendal
a6b027084c Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-06 23:29:52 +00:00
Jinsuk Kim
85c927cfc2 Merge "CEC: Ensure the key transmission finishes all the time" into lmp-mr1-dev 2014-10-06 23:15:35 +00:00
Wei Liu
de93b1049e am a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev 
* commit 'a940f8656d5ca6eb2d737a9a480166c760684ee0':
  Hide bug report notification in Android Framework from watches.
 2014-10-06 22:35:09 +00:00
Wei Liu
a940f8656d Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev 2014-10-06 22:10:33 +00:00
Geoff Mendal
b501dd1fad Import translations. DO NOT MERGE 
Change-Id: I157884cf5f8c29c59f1365a28578d988a0a357a5
Auto-generated-cl: translation import
 2014-10-06 14:58:45 -07:00
Wei Liu
e255e4e536 Hide bug report notification in Android Framework from watches. 
Bug: 17806348
Change-Id: I1a90a9bc68d8ef4ff540dbbd9e4af4bfed8a61ae
 2014-10-06 14:50:10 -07:00
ztenghui
8cdb0bc087 Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev 2014-10-06 20:04:08 +00:00
Amit Mahajan
384ff9ef5d am 15c581fa: am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev 
* commit '15c581fa4c0dcff09d2fd65d6978f286b8b23b94':
  ATT: Call does not establish to  '*1'
 2014-10-06 19:28:53 +00:00
Geoff Mendal
aece3ec511 am ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ce2b1e8cfaa67f27502d4db837d197409453aae4':
  Import translations. DO NOT MERGE
 2014-10-06 19:28:44 +00:00
Amit Mahajan
15c581fa4c am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev 
* commit '17d7c79650664c7a112ab175cb2329d2062f4d1e':
  ATT: Call does not establish to  '*1'
 2014-10-06 19:23:20 +00:00
Geoff Mendal
f132e7ef0e am aa5c62f3: (-s ours) am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'aa5c62f35999c2dc165771740e96c30b1b932aeb':
  Import translations. DO NOT MERGE
 2014-10-06 19:23:03 +00:00
Christopher Tate
3dd06aba80 am 39006668: am bbebe423: Merge "adb backup/restore fixes" into lmp-dev 
* commit '39006668235f9cdeac853911426b1543d3b092d0':
  adb backup/restore fixes
 2014-10-06 19:22:59 +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
Geoff Mendal
4795dfba7f am 3647aba8: (-s ours) am ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3647aba82d30143e301d4bb251085f79308d872a':
  Import translations. DO NOT MERGE
 2014-10-06 19:22:48 +00:00
John Spurlock
b6f5cb3e45 am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '81b96aadbdc3726186c91b51465fb21ead56888a':
  Fix NPE in StrictMode handling.
 2014-10-06 19:22:44 +00:00
Andrew Solovay
da81acdffe am ed2237ae: am 2dd86d50: Merge "Removed preview license." into lmp-dev 
* commit 'ed2237aec8d348ee530f0c88c08392351690e5bb':
  Removed preview license.
 2014-10-06 19:22:40 +00:00
Geoff Mendal
ce2b1e8cfa Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-06 19:21:53 +00:00
Geoff Mendal
b041304094 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-06 19:18:38 +00:00
Geoff Mendal
aa5c62f359 am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '712363889899bfff564a39ef4d88ff048a9e5ec7':
  Import translations. DO NOT MERGE
 2014-10-06 19:17:23 +00:00
Christopher Tate
3900666823 am bbebe423: Merge "adb backup/restore fixes" into lmp-dev 
* commit 'bbebe42309a7012e0474b916f5209027889e8d57':
  adb backup/restore fixes
 2014-10-06 19:17:17 +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
Amit Mahajan
17d7c79650 Merge "ATT: Call does not establish to '*1'" into lmp-dev 2014-10-06 19:17:06 +00:00
Geoff Mendal
3647aba82d am ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ec763118370e1fa79acb96b82a7ad37b6f2cc02e':
  Import translations. DO NOT MERGE
 2014-10-06 19:17:04 +00:00
John Spurlock
81b96aadbd am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '78cc93ec80f5dcc487db697a1f9a545890745847':
  Fix NPE in StrictMode handling.
 2014-10-06 19:16:53 +00:00
Andrew Solovay
ed2237aec8 am 2dd86d50: Merge "Removed preview license." into lmp-dev 
* commit '2dd86d50ae19efa071d83e02545b2767c351fdd6':
  Removed preview license.
 2014-10-06 19:16:47 +00:00
Geoff Mendal
7123638898 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-06 19:10:25 +00:00
Christopher Tate
bbebe42309 Merge "adb backup/restore fixes" into lmp-dev 2014-10-06 19:09:13 +00:00
Geoff Mendal
2c54b25580 Import translations. DO NOT MERGE 
Change-Id: I97d45a200138bb1a232327dacf2f933b69efc6ec
Auto-generated-cl: translation import
 2014-10-06 12:08:45 -07:00
Bing Gao
1c9bc00870 ATT: Call does not establish to '*1' 
Bug: 17809849
Change-Id: I43566c9f3b7a72b06a4b5f2a0a312ac42410269d
 2014-10-06 19:00:44 +00:00
Benson Huang
1e62e476fa am ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app 
* commit 'ce4483cb83afb3a42a32ef2cb00cf04d6f9018fd':
  [FM] Add FM_TUNER audio source to support L version FM radio app
 2014-10-06 18:54:19 +00:00
Benson Huang
ce4483cb83 [FM] Add FM_TUNER audio source to support L version FM radio app 
1.MediaRecorder.java: Add FM_TUNER audio source type for FM record.
    2.AudioRecord.java: For FM output to the other device,
     (except the headset case), record the FM tuner signal to a track
      and playback the recorded signal by a track.
    3.AudioAttributes.java: Thus we use AudioRecord, need to modify
      setCapturePreset to support MediaRecorder.AudioSource.FM_TUNER.

    Review: https://partner-android-review.git.corp.google.com/#/c/182071

    Signed-off-by: Benson Huang <benson.huang@mediatek.com>

Change-Id: If068d0bbbffb4848887004396a8a8d9bcba1334e
 2014-10-06 18:50:12 +00:00
Dianne Hackborn
7f7d240b13 Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 2014-10-06 18:48:34 +00:00
Geoff Mendal
419c63bf0e Import translations. DO NOT MERGE 
Change-Id: Ia892f6f28e8ad353ae460f3e167bb68d2246ac13
Auto-generated-cl: translation import
 2014-10-06 11:46:22 -07:00
Geoff Mendal
1c837af01d am 937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '937d6a6476be3ce06f3c9c10836a4399b7514231':
  Import translations. DO NOT MERGE
 2014-10-06 18:38:41 +00:00
Geoff Mendal
74a72f723a Import translations. DO NOT MERGE 
Change-Id: Iccf9bb82d63d8e5033f916ad5c89cff245ef2087
Auto-generated-cl: translation import
 2014-10-06 11:34:20 -07:00
Geoff Mendal
937d6a6476 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-06 18:33:46 +00:00
Geoff Mendal
88bc51ffca Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-06 18:32:35 +00:00
Geoff Mendal
ec76311837 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-06 18:32:19 +00:00
Geoff Mendal
c1a064dd94 Import translations. DO NOT MERGE 
Change-Id: I391b269b0d535fa7d8a4082cb0271b0aeb16a497
Auto-generated-cl: translation import
 2014-10-06 10:56:58 -07:00
Geoff Mendal
f65288da06 Import translations. DO NOT MERGE 
Change-Id: Ieb7aeaea1204f4ba7daf3abd7a30f647564807dd
Auto-generated-cl: translation import
 2014-10-06 10:55:10 -07:00
John Spurlock
78cc93ec80 Merge "Fix NPE in StrictMode handling." into lmp-dev 2014-10-06 17:54:41 +00:00
Geoff Mendal
86dec04749 Import translations. DO NOT MERGE 
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
Auto-generated-cl: translation import
 2014-10-06 10:54:01 -07:00
Andrew Solovay
2dd86d50ae Merge "Removed preview license." into lmp-dev 2014-10-06 17:51:53 +00:00
Adam Powell
00092db1af Fix build breakage in API check 
Change-Id: I0fe7849b8b834fb32b13e60657685f72d1110d21
 2014-10-06 10:11:43 -07:00
John Spurlock
9bb3dacbf9 Fix NPE in StrictMode handling. 
Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
 2014-10-06 12:36:45 -04:00
Yuncheol Heo
345f3d00b8 am 4cb8455f: am 71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev 
* commit '4cb8455fba9b70339bacf28ff813118ad542165d':
  CEC: Reset active source status on routing control
 2014-10-06 16:30:02 +00:00
Benjamin Franz
31409c0ccd Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev 2014-10-06 16:26:27 +00:00