Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
e91ab7f080 am 377d80ba: Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 
* commit '377d80ba53d4eda31d131f4f2bd899668cad426b':
  Put native apps above browser in resolver activity.
 2014-11-13 00:07:25 +00:00
Chris Craik
075b2b4ff9 Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 2014-11-13 00:05:59 +00:00
Dianne Hackborn
377d80ba53 Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 2014-11-13 00:03:53 +00:00
Florian Salbrechter
3c76833e50 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-11-13 00:02:48 +00:00
ztenghui
1b694f19b2 am d46cf713: Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev automerge: ffcb5e2 
automerge: c3e2910

* commit 'c3e29108fcd87b8229cddacec98e63fe5f79efdf':
  AVD: Requires all animator has stopped before start again.
 2014-11-13 00:01:18 +00:00
Renato Mangini
7b3b8804e7 am 8d6699cc: am 19865ccd: am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '8d6699cc9776630a4da4cfcc7b03458569145e17':
  Fix the order of sample categories left nav.
 2014-11-13 00:00:57 +00:00
Geoff Mendal
8cb8a73e80 am f6250952: (-s ours) am 57f06e94: (-s ours) am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f625095204b76d5ddc1b32a8ce993da5172f9a64':
  Import translations. DO NOT MERGE
 2014-11-13 00:00:49 +00:00
Etan Cohen
14eef7a1d1 am 8cb9ea49: am c3dfc340: am 00ead120: Fix VoLTE configuration on secondary TMO MCC/MNC. 
* commit '8cb9ea49015dc480cc605ee9d9291caf6976f234':
  Fix VoLTE configuration on secondary TMO MCC/MNC.
 2014-11-13 00:00:38 +00:00
George Mount
0be5277cdc am cc66b9df: am 4978ebe0: am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 
* commit 'cc66b9dfda509ea8fd16adaa91a9f5f6adc9e21b':
  Update GhostView properly when underlying view changes.
 2014-11-13 00:00:33 +00:00
Jeff Sharkey
29df9915e6 am bea6648d: am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates. 
* commit 'bea6648df5b06240380bc0bf6feefa9af24f7d4f':
  Recover apps with malformed certificates.
 2014-11-13 00:00:29 +00:00
Alan Viverette
8aa0bbfcc7 am 469e72ff: am 5f876974: am 667ec63c: Merge "Don\'t propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev 
* commit '469e72ffe70e05101dddc8b49f5add0b6888a9d4':
  Don't propagate AnimatedStateListDrawable state change to super()
 2014-11-13 00:00:24 +00:00
George Mount
d17a676a83 am a6d33fd7: am 3ba2c7c6: am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 
* commit 'a6d33fd7ba55cde67ca56c93e3c68592686bb01e':
  Fix getChildVisibleRect to clip correctly.
 2014-11-13 00:00:20 +00:00
Ignacio Solla
d48fe73063 am 4fc66e58: am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev 
* commit '4fc66e582ac25c875e3131ca055daeddc284387f':
  Fix docs build breakage
 2014-11-13 00:00:15 +00:00
Dianne Hackborn
ebb526e976 am 7437ec8e: am caf3cddd: am fabb70b2: Add reporting of Parcel memory/count. 
* commit '7437ec8e1d01de948b1baf33c1f3f73f263a40c7':
  Add reporting of Parcel memory/count.
 2014-11-13 00:00:10 +00:00
Rob Tsuk
42a41ab813 am 6552afa8: (-s ours) am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 
* commit '6552afa87833a36b37c715acd40e494fe4de2019':
  Add a way to override Xfermode DO NOT MERGE
 2014-11-13 00:00:05 +00:00
Ignacio Solla
f3c3c8e4c5 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-11-13 00:00:03 +00:00
Alan Viverette
edd1e72631 am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba 
automerge: 84ed482

* commit '84ed482ff9a9e8f6ea6e14c978d4311f23396bc6':
  Fix default attributes in ScaleDrawable
 2014-11-12 23:59:56 +00:00
Ignacio Solla
84ee41f507 am fd003c70: am dfb25b3d: am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev 
* commit 'fd003c707e57326a463acd31c232fc9ad306ec92':
  [WebView] Interface to access hidden APIs.
 2014-11-12 23:59:53 +00:00
ztenghui
952de42b45 am 5679d937: am ab6515f6: am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 
* commit '5679d937ff033ff1fa86245d646b6e5dbf23d635':
  Shadow: Fix the crash in spot shadow
 2014-11-12 23:59:49 +00:00
ztenghui
74a2d7695e am c3e29108: am d46cf713: Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev automerge: ffcb5e2 
* commit 'c3e29108fcd87b8229cddacec98e63fe5f79efdf':
  AVD: Requires all animator has stopped before start again.
 2014-11-12 23:59:44 +00:00
Alan Viverette
710f713baa am 84ed482f: am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba 
* commit '84ed482ff9a9e8f6ea6e14c978d4311f23396bc6':
  Fix default attributes in ScaleDrawable
 2014-11-12 23:59:40 +00:00
Eric Laurent
4a0e59dbd4 am 33fc2370: am ac598888: Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev automerge: edd4a22 
* commit '33fc23701a081c2086fc5435e7913f775caabdfc':
  audiosystem JNI: check env pointer before use.
 2014-11-12 23:59:35 +00:00
Eric Laurent
35f6c4f702 am ac598888: Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev automerge: edd4a22 
automerge: 33fc237

* commit '33fc23701a081c2086fc5435e7913f775caabdfc':
  audiosystem JNI: check env pointer before use.
 2014-11-12 23:58:33 +00:00
xinhe
c93802b993 Update enabe/disableCellBroadcast with RAN argument 
Allow them to take an explicit argument indicating GSM or CDMA range and
fix the extreme alert disable error.

Bug: 18202935
Change-Id: Ibf12be65c60807834705e7cc9e94ec485ce6b60a
 2014-11-12 15:58:16 -08:00
Sandeep Siddhartha
229a266481 am 5f02d295: Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev automerge: 850ec91 
automerge: 41dc467

* commit '41dc467957a77dce6fea25d29ddb5dd9d8be75df':
  Don't unload the sound model on stopRecognition
 2014-11-12 23:56:59 +00:00
Ruben Brunk
e8b55bc6cc am b70dca2d: Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev automerge: 68ced89 
automerge: 091bf0c

* commit '091bf0cc465a52e9d572e4d950bc3af74910c5e1':
  Frameworks/base: Right transform in DngCreator
 2014-11-12 23:55:44 +00:00
Renato Mangini
8d6699cc97 am 19865ccd: am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '19865ccd44958b0902b9eedd11df279a03ff74c1':
  Fix the order of sample categories left nav.
 2014-11-12 23:53:17 +00:00
Andrew Lee
840162d2b4 Add telephony.DisconnectCause for merged IMS call. 
When merged, IMS calls are consolidated into one call. Thus they
"disconnect", even though the user can continue to comminucate
with the party on that call.

We want to recognize this scenario so we can control relevant
behaviors (ie.don't play the "end call" tone in this case).

Bug: 18291234
Change-Id: I93247f88ed74467470504bec88fcfb7ed714f0ff
 2014-11-12 15:52:32 -08:00
Etan Cohen
8cb9ea4901 am c3dfc340: am 00ead120: Fix VoLTE configuration on secondary TMO MCC/MNC. 
* commit 'c3dfc340124ebb2e2e4cc46114ede74d5b9ebf88':
  Fix VoLTE configuration on secondary TMO MCC/MNC.
 2014-11-12 23:51:34 +00:00
Zoltan Szatmary-Ban
201caf57f9 Adding method to query backup manager service activity status 
Bug: 17367491
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
 2014-11-12 23:51:31 +00:00
George Mount
cc66b9dfda am 4978ebe0: am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 
* commit '4978ebe04f4c06f5672e734665c592838a5d634b':
  Update GhostView properly when underlying view changes.
 2014-11-12 23:51:25 +00:00
Jeff Sharkey
bea6648df5 am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates. 
* commit 'a2781fdac332c4f6277a986c88e34daa25a3b5f9':
  Recover apps with malformed certificates.
 2014-11-12 23:50:47 +00:00
Alan Viverette
469e72ffe7 am 5f876974: am 667ec63c: Merge "Don\'t propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev 
* commit '5f876974d025406cd48eac9759989c09c899a4dd':
  Don't propagate AnimatedStateListDrawable state change to super()
 2014-11-12 23:49:46 +00:00
Rob Tsuk
c495e611b9 Add a way to override Xfermode 
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Bug: 18226391
Change-Id: I6f8fb8938505e976892c4e14f6f864362c43e73c
 2014-11-12 15:49:45 -08:00
George Mount
a6d33fd7ba am 3ba2c7c6: am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 
* commit '3ba2c7c681f3bf355cef1c6e32a6fdf315865f57':
  Fix getChildVisibleRect to clip correctly.
 2014-11-12 23:49:40 +00:00
Ignacio Solla
4fc66e582a am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev 
* commit 'ba1d4cd4fe65e60ba3eaef9cfbe93cb99424ef47':
  Fix docs build breakage
 2014-11-12 23:49:31 +00:00
Dianne Hackborn
7437ec8e1d am caf3cddd: am fabb70b2: Add reporting of Parcel memory/count. 
* commit 'caf3cddd5bff11a20e72e7df54b826e33d2fe6a9':
  Add reporting of Parcel memory/count.
 2014-11-12 23:49:25 +00:00
Rob Tsuk
6552afa878 am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 
* commit 'ccc956b2b4602dca28f7c79d1155df29bcc0d696':
  Add a way to override Xfermode DO NOT MERGE
 2014-11-12 23:49:19 +00:00
Ignacio Solla
fd003c707e am dfb25b3d: am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev 
* commit 'dfb25b3dec64fb9537d5f34771b7f4a1812925b9':
  [WebView] Interface to access hidden APIs.
 2014-11-12 23:49:13 +00:00
ztenghui
5679d937ff am ab6515f6: am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 
* commit 'ab6515f6214a09e23deee4b432b41d1849ae403f':
  Shadow: Fix the crash in spot shadow
 2014-11-12 23:49:08 +00:00
Renato Mangini
19865ccd44 am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '5d7f91c77605a5c444eaaae2b812280c57ca244c':
  Fix the order of sample categories left nav.
 2014-11-12 23:47:14 +00:00
Geoff Mendal
f625095204 am 57f06e94: (-s ours) am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '57f06e94eb10bfb4edcfe452eb683a920d19ec77':
  Import translations. DO NOT MERGE
 2014-11-12 23:46:00 +00:00
Geoff Mendal
57f06e94eb am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2d28d697f6235c497237a11abb973b9109999e38':
  Import translations. DO NOT MERGE
 2014-11-12 23:41:57 +00:00
ztenghui
c3e29108fc am d46cf713: Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev automerge: ffcb5e2 
* commit 'd46cf7138a955d004911bbd637535390030b328f':
  AVD: Requires all animator has stopped before start again.
 2014-11-12 23:40:21 +00:00
Alan Viverette
84ed482ff9 am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba 
* commit '1c252a6f8b3dbeb7aa533203731256b3b037d3e2':
  Fix default attributes in ScaleDrawable
 2014-11-12 23:40:10 +00:00
Eric Laurent
33fc23701a am ac598888: Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev automerge: edd4a22 
* commit 'ac598888e3efbb6fda910ac8bef3bc92811309ba':
  audiosystem JNI: check env pointer before use.
 2014-11-12 23:40:05 +00:00
Sandeep Siddhartha
41dc467957 am 5f02d295: Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev automerge: 850ec91 
* commit '5f02d29550588a17add0b83f7e7bfcd324f20778':
  Don't unload the sound model on stopRecognition
 2014-11-12 23:39:50 +00:00
Ruben Brunk
091bf0cc46 am b70dca2d: Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev automerge: 68ced89 
* commit 'b70dca2d21fd73e77329b07175ca3fb25bc02774':
  Frameworks/base: Right transform in DngCreator
 2014-11-12 23:39:27 +00:00
Renato Mangini
5d7f91c776 am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '40ac90e99da90956f26cf7f7bb4c205e28bbbc66':
  Fix the order of sample categories left nav.
 2014-11-12 23:39:11 +00:00
Geoff Mendal
2d28d697f6 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-12 23:37:57 +00:00