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

152010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
9762ffc062 am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev 
* commit 'fd289c1c10c9da50a747f8eb4a52f49aad83f418':
  Disable RT-anim for AnimatorSet
 2014-09-06 00:29:49 +00:00
Alan Viverette
e453da8baa am 9239ba20: Merge "Propagate drawable hotspots when duplicate parent state is enabled" into lmp-dev 
* commit '9239ba20a85df91e9285d543bbeb1b1843d060d0':
  Propagate drawable hotspots when duplicate parent state is enabled
 2014-09-06 00:25:37 +00:00
John Reck
3207ffe120 Merge "Disable RT-anim for AnimatorSet" into lmp-dev 2014-09-06 00:22:25 +00:00
Derek Tan
4fd94e6794 am de6fefb4: Merge "Update the preferred network type APIs." into lmp-dev 
* commit 'de6fefb4f5e9da6aedc600abd7c10d14398b47c7':
  Update the preferred network type APIs.
 2014-09-06 00:17:34 +00:00
Alan Viverette
9ffe8c06e5 Merge "Propagate drawable hotspots when duplicate parent state is enabled" into lmp-dev 2014-09-06 00:15:09 +00:00
Derek Tan
bf7f53e29d Merge "Update the preferred network type APIs." into lmp-dev 2014-09-06 00:10:12 +00:00
Derek Tan
54e883bedc Update the preferred network type APIs. 
Bug: 17255752
Change-Id: I8f74749752f8d8c6cd5b28dd5fe4ed89a33481ed
 2014-09-05 17:06:46 -07:00
Tsuwei Chen
04800b8317 am 30028094: Merge "Properly register all Intent filters. Bug: 17408889 Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152" into lmp-dev 
* commit '3002809499ff5bf65c40fd085801a50a92bf218f':
  Properly register all Intent filters. Bug: 17408889 Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152
 2014-09-06 00:03:38 +00:00
Adam Lesinski
7c092bf232 am b604d63b: Store time offsets for UsageStats XML 
* commit 'b604d63b183ebd69ac6bd0112dd340f34cbcacef':
  Store time offsets for UsageStats XML
 2014-09-06 00:03:33 +00:00
Adam Lesinski
1213eca61c am 0955da29: Merge "Returns UsageEvents from previous days" into lmp-dev 
* commit '0955da29aa40d446dff58260c4ae404255a773d0':
  Returns UsageEvents from previous days
 2014-09-06 00:03:26 +00:00
Derek Tan
0f7a0a4b1a am 6f25963e: Merge "Remove setCdmaSubscription API." into lmp-dev 
* commit '6f25963ebc8f91638b056107a7b7bdb6e182102f':
  Remove setCdmaSubscription API.
 2014-09-06 00:03:22 +00:00
Tsuwei Chen
fec0f4fc30 Merge "Properly register all Intent filters. Bug: 17408889 Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152" into lmp-dev 2014-09-05 23:59:13 +00:00
Adam Lesinski
37a46b48dc Store time offsets for UsageStats XML 
This will make adjusting for time changes easier
in the future.

Change-Id: I49d2dda4cc6dcb1378a58c814849924f585e0417
 2014-09-05 23:57:42 +00:00
Adam Lesinski
cd922b29b5 Merge "Returns UsageEvents from previous days" into lmp-dev 2014-09-05 23:57:19 +00:00
Derek Tan
50e8b3d9bb am d16f633f: Merge "Update the comment in sendEnvelope." into lmp-dev 
* commit 'd16f633fc9c949af155b3dff5f6f2d98c50a7c80':
  Update the comment in sendEnvelope.
 2014-09-05 23:54:58 +00:00
Shishir Agrawal
11f27ff315 am 32148644: Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev 
* commit '321486444e6c4d7ee77f8981e9921b923308ced9':
  API change: SetOperatorBrandOverride should not take iccId as a param.
 2014-09-05 23:54:53 +00:00
Santos Cordon
2d7970ea53 am 6918cef8: Merge "Updating APIs for CDMA conference call support." into lmp-dev 
* commit '6918cef8ab9adb03547f2933705a29d22c878598':
  Updating APIs for CDMA conference call support.
 2014-09-05 23:54:37 +00:00
Alan Viverette
16d2d510f7 am c0b09353: Merge "Simplify ripple background drawing, fix ripple alphas" into lmp-dev 
* commit 'c0b093530336a9016acfbb333dbd35784c2cf60a':
  Simplify ripple background drawing, fix ripple alphas
 2014-09-05 23:54:33 +00:00
Derek Tan
b5928445d1 Merge "Remove setCdmaSubscription API." into lmp-dev 2014-09-05 23:53:55 +00:00
Derek Tan
a0729d3487 Merge "Update the comment in sendEnvelope." into lmp-dev 2014-09-05 23:53:10 +00:00
Shishir Agrawal
1244333998 Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev 2014-09-05 23:51:40 +00:00
Santos Cordon
f7c8b58e84 Merge "Updating APIs for CDMA conference call support." into lmp-dev 2014-09-05 23:46:11 +00:00
Jean-Michel Trivi
749eec706a am 2a56275e: Merge "Respect Android conventions in AudioManager extras" into lmp-dev 
* commit '2a56275e4f09d0bd7e2b50d694686ff3f15357a2':
  Respect Android conventions in AudioManager extras
 2014-09-05 23:46:05 +00:00
Jean-Michel Trivi
ae104eb6c6 am 1c01afc0: Merge "AudioAttributes: unhide CREATOR" into lmp-dev 
* commit '1c01afc06ed47fbd983bc8e7c52851d0518021d7':
  AudioAttributes: unhide CREATOR
 2014-09-05 23:46:00 +00:00
Alan Viverette
e9921370d7 Merge "Simplify ripple background drawing, fix ripple alphas" into lmp-dev 2014-09-05 23:45:36 +00:00
Jeff Sharkey
d560851911 am 89e86555: Merge "Separate active state from open/close." into lmp-dev 
* commit '89e865552f42db5cc31ef48ad35f3392e4ed1ac2':
  Separate active state from open/close.
 2014-09-05 23:41:14 +00:00
Jean-Michel Trivi
afd899c61f Merge "Respect Android conventions in AudioManager extras" into lmp-dev 2014-09-05 23:37:10 +00:00
Jean-Michel Trivi
2caa0a6070 Merge "AudioAttributes: unhide CREATOR" into lmp-dev 2014-09-05 23:36:44 +00:00
Jeff Sharkey
5341f94a19 Merge "Separate active state from open/close." into lmp-dev 2014-09-05 23:28:31 +00:00
Lajos Molnar
888739e7dc am 00352e1e: Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev 
* commit '00352e1eec8b09375e695fb54f6fffc023bb6aa9':
  MediaCodecInfo: allow getting info for secure codec
 2014-09-05 23:19:29 +00:00
Lajos Molnar
fe08443eb5 am fd03c56c: Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev 
* commit 'fd03c56cbb2be8db4f381c8459d405129e92e569':
  MediaCodecInfo: rename createFromProfileLevel
 2014-09-05 23:19:24 +00:00
Jeff Sharkey
bc7bce38b2 Separate active state from open/close. 
Also change name to setStagingProgress() to make it clearer that
system may adjust the range.  Start throwing from openSession() in
preparation for ASEC allocation moving.

Bug: 17405741
Change-Id: Id7da51a32d5d89cb512ddafbd7ceaafbcd41cac6
 2014-09-05 16:16:39 -07:00
Santos Cordon
a48680427e Updating APIs for CDMA conference call support. 
Bug:17316859
Change-Id: Ib80c4dcf99c8599c011496756c363c3e6147c20a
 2014-09-05 16:13:19 -07:00
Lajos Molnar
cfc102685c Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev 2014-09-05 23:09:33 +00:00
Adam Lesinski
d26bea3a14 Returns UsageEvents from previous days 
- Avoid writing to disk when querying UsageStats.
- Use new UnixCalendar to avoid issues with Locale and TimeZone.

Bug: 16951313

Change-Id: I2473b8ef8dc1e2f6be22d4c689b96e346bdcafd5
 2014-09-05 23:09:27 +00:00
Lajos Molnar
b860155de1 Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev 2014-09-05 23:08:25 +00:00
Tsuwei Chen
48d37f957a Properly register all Intent filters. 
Bug: 17408889
Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152
 2014-09-05 23:05:49 +00:00
Vineeta Srivastava
a5bc46388b am a8ceba1c: Merge "Plus code handling for non-NANP CDMA carrier" into lmp-dev 
* commit 'a8ceba1cb610c2ce166d4cdcbdb6eaec08886aa9':
  Plus code handling  for non-NANP CDMA carrier
 2014-09-05 23:02:48 +00:00
John Reck
f5945a0c8b Disable RT-anim for AnimatorSet 
Bug: 17317184

 Unfortunately this will disable *all* RT animations in a scene,
 but we don't have more selective targetting currently

Change-Id: I57e1c0ae43957f45229473bdcdaf34c05825fab7
 2014-09-05 15:58:26 -07:00
Jean-Michel Trivi
deddda5d62 Respect Android conventions in AudioManager extras 
Update the value of the extras in android.media.AudioManager
  used in ACTION_HDMI_AUDIO_PLUG to respect the Android
  naming conventions.

Bug 17390818

Change-Id: Ied1830e0ffa3b1fa7235d0675f36f2f43aac554d
 2014-09-05 15:55:32 -07:00
Vineeta Srivastava
ac74e16cd3 Merge "Plus code handling for non-NANP CDMA carrier" into lmp-dev 2014-09-05 22:53:50 +00:00
John Reck
265437d3da am 4a94f088: Merge "Fix race condition" into lmp-dev 
* commit '4a94f088cea6e550cde6289952d5e745622db3f9':
  Fix race condition
 2014-09-05 22:45:45 +00:00
Svetoslav
ca9dde9932 am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev 
* commit '3b42928c318d2732d75bb9c0ed7b864c47a265a2':
  Print spooler UI polish and bug fixes.
 2014-09-05 22:45:40 +00:00
Chris Craik
b94670e082 am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 
* commit '6f6a8f2c49aaf07f74310e405abc799c8d05fa19':
  Add shadow/clipping properties to HierarchyViewer
 2014-09-05 22:45:35 +00:00
John Reck
4e849178ef Merge "Fix race condition" into lmp-dev 2014-09-05 22:38:42 +00:00
Shishir Agrawal
d2cfa92146 API change: SetOperatorBrandOverride should not take iccId as a param. 
Taking ICCID as a parameter is not scure since a carrier can override the
brand for other carriers. We should override only the current ICCID.

Bug: 17390144

Change-Id: I9be2cb5c5fa15367fcb3b548b6e601a294e84dbc
 2014-09-05 15:37:44 -07:00
Svetoslav
d89c5ad3d3 Merge "Print spooler UI polish and bug fixes." into lmp-dev 2014-09-05 22:37:39 +00:00
Chris Craik
83eb430270 Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 2014-09-05 22:36:41 +00:00
Sreeram Ramachandran
8b3151fa49 am fc005f52: Merge "Unescape strings properly in NsdService." into lmp-dev 
* commit 'fc005f52578ed9fa3ea34fa5f29085b25a9ff566':
  Unescape strings properly in NsdService.
 2014-09-05 22:35:55 +00:00
Jean-Michel Trivi
8aacb2e96c AudioAttributes: unhide CREATOR 
android.media.AudioAttributes implements the Parcelable interface,
 and is part of the SDK, it therefore requires CREATOR, writeToParcel,
 and describeContents to be "unhidden".
CREATOR was still @hide

Bug 17390818

Change-Id: I9c1cb1d454fe538cb5be6066ebed290a99352da9
 2014-09-05 22:30:36 +00:00