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

149670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
908fdcceac am 4f952625: Merge "Content description for next alarm" into lmp-dev 
* commit '4f952625b83b77b85db3e3dc6d3f9dc26ccf7c67':
  Content description for next alarm
 2014-08-22 00:13:18 +00:00
Jorim Jaggi
048f0cf01c Merge "Content description for next alarm" into lmp-dev 2014-08-22 00:05:46 +00:00
Santos Cordon
7117d47130 am b3e396c2: Additional changes for Conference. 
* commit 'b3e396c26fe39ad765109090f56adcd51e3dd738':
  Additional changes for Conference.
 2014-08-21 23:54:43 +00:00
Santos Cordon
0159ac0cfe Additional changes for Conference. 
1) Connection.setConference() checked to see if the conference was valid
before setting it.  This prevented us from populating child connections
on a new conference until it was added.  Now we allow it but dont sent
the update unless the conference has already been sent.
2) removed unnecessary ArrayList<>() wrappers on CopyOnWriteLists.
3) Updated disconnect/hold/unhold so that they are sent to Conference
objects as well as Connection objects.
4) Added support for separating a child conference call.
5) Additional Logging

Bug: 15621105
Bug: 17136172
Change-Id: I939c36bc9694b9d81f0ff582e2fbe335006aa485
 2014-08-21 23:40:35 +00:00
Jorim Jaggi
321583d540 Content description for next alarm 
Also fixes a bug where "status" was read out with TalkBack for no
good reason.

Bug: 15694080
Change-Id: Id295eb70af880d93ff928ebc337b09a8d679120d
 2014-08-22 01:33:33 +02:00
Lajos Molnar
a8d413af33 am b5935c4c: Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev 
* commit 'b5935c4c85b17edc4c04943376973d8978181176':
  MediaCodec: expand documentation on flush/EOS handling and adaptive playback
 2014-08-21 23:08:04 +00:00
George Mount
4b88c6fb0c am c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev 
* commit 'c559e14dc1be802bcfe15c989e2c66c9df0e327a':
  Add Parent Change to ChangeTransform
 2014-08-21 23:07:59 +00:00
Lajos Molnar
c54a76cbcd Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev 2014-08-21 23:05:28 +00:00
George Mount
99db6030e1 Merge "Add Parent Change to ChangeTransform" into lmp-dev 2014-08-21 23:00:05 +00:00
Dake Gu
c94e2b393f Add Parent Change to ChangeTransform 
Bug 16460123

Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.

Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee
 2014-08-21 15:50:17 -07:00
Igor Murashkin
8d8954b71c am 54be067e: Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 
* commit '54be067e47c30a69232a3402cdd7cd115c915b77':
  camera2: Enable configuration failure to call #onConfigureFailed
 2014-08-21 22:43:25 +00:00
George Mount
d5e97d6ce2 am 3061f12a: Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 
* commit '3061f12affddaa50ac16ea14a727f35b8ba23337':
  Allow Activities to opt into using Overlay for shared elements.
 2014-08-21 22:34:52 +00:00
Ronghua Wu
2a35dbac8e am 60eb4e9c: Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev 
* commit '60eb4e9c5ae5d7ffa1adb75de8d3726066cfe84e':
  MediaHTTPConnection: handles cross protocol redirects.
 2014-08-21 22:34:48 +00:00
Igor Murashkin
b68654ce84 Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 2014-08-21 22:33:29 +00:00
George Mount
7762e8e798 Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 2014-08-21 22:26:57 +00:00
Ronghua Wu
c90c7d257c Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev 2014-08-21 22:24:16 +00:00
Jing Zhao
a0765449fd am d37bacd8: VoLTE incoming call number 
* commit 'd37bacd80dcb943c64737d1b3ebe3625cf285042':
  VoLTE incoming call number
 2014-08-21 22:14:11 +00:00
Adam Lesinski
b93ea0865e am 247d27d1: Merge "Add better error message for AAPT file conflicts" into lmp-dev 
* commit '247d27d1ab0daa189d0659d3d7904b749b179eba':
  Add better error message for AAPT file conflicts
 2014-08-21 22:06:10 +00:00
Adam Lesinski
f0427c0e68 am db2a74d4: Merge "AAPT: mipmaps should not end up in Splits" into lmp-dev 
* commit 'db2a74d498b26934e885f7de412aeaeaed78866d':
  AAPT: mipmaps should not end up in Splits
 2014-08-21 22:06:05 +00:00
Jing Zhao
e647a013a0 VoLTE incoming call number 
Set incoming call number in OIR to be shown to user

Bug: 17032453
Change-Id: Iceadb0f537fb35f685cbcf8279ccef7d86036600
 2014-08-21 22:05:04 +00:00
Adam Lesinski
d255aba093 Merge "Add better error message for AAPT file conflicts" into lmp-dev 2014-08-21 22:00:25 +00:00
Adam Lesinski
628f670a54 Merge "AAPT: mipmaps should not end up in Splits" into lmp-dev 2014-08-21 22:00:09 +00:00
Stephen Hines
6c6e3176a5 am fdacc4b5: Merge "We need to specify a target SDK < 21 to use graphics RS." into lmp-dev 
* commit 'fdacc4b5fb75fba8ae98237754f472ba08364df7':
  We need to specify a target SDK < 21 to use graphics RS.
 2014-08-21 21:57:39 +00:00
Stephen Hines
b020563811 Merge "We need to specify a target SDK < 21 to use graphics RS." into lmp-dev 2014-08-21 21:48:18 +00:00
Dianne Hackborn
2e293a7e15 am a1984be1: Merge "Work on issue #16683269: system_server still leaking memory" into lmp-dev 
* commit 'a1984be1e826314a6cd8442148a23a16ff066019':
  Work on issue #16683269: system_server still leaking memory
 2014-08-21 21:44:26 +00:00
Elliott Hughes
7a4a99f0b2 am b7c2ac25: Merge "Don\'t say "Arabic (Egypt)" in Settings." into lmp-dev 
* commit 'b7c2ac254d6e7546fc95ae601298f7df4c619429':
  Don't say "Arabic (Egypt)" in Settings.
 2014-08-21 21:34:47 +00:00
Dianne Hackborn
0104503c50 Merge "Work on issue #16683269: system_server still leaking memory" into lmp-dev 2014-08-21 21:34:09 +00:00
George Mount
b89d5cc2c6 Allow Activities to opt into using Overlay for shared elements. 
Bug 17001227

Change-Id: Icc49a81357ee69abd2a15a1d1efcead298ab3fb7
 2014-08-21 14:30:51 -07:00
Elliott Hughes
105f6ceb0f Merge "Don't say "Arabic (Egypt)" in Settings." into lmp-dev 2014-08-21 21:24:44 +00:00
Robert Greenwalt
8a8c3ab042 am c540c917: Merge "Change the NetworkInfo for disconnected types." into lmp-dev 
* commit 'c540c9171603070822dd244518b9809248263d4d':
  Change the NetworkInfo for disconnected types.
 2014-08-21 21:13:20 +00:00
Robert Greenwalt
56a9ed858c Merge "Change the NetworkInfo for disconnected types." into lmp-dev 2014-08-21 21:02:19 +00:00
Adam Lesinski
27f69f4e06 AAPT: mipmaps should not end up in Splits 
Mipmaps are never filtered, and so they will always
end up in the base APK. Make sure they get omitted from
any split.

Change-Id: Id24b082bc9bd2d3f031a58bd0de4d30b4f0de7e0
 2014-08-21 13:59:46 -07:00
Chris Craik
d22a71761e am c5e5f0a4: Merge "Enable scissor for rounded outline clips" into lmp-dev 
* commit 'c5e5f0a4526bce5c63066e87f89e5890966ea509':
  Enable scissor for rounded outline clips
 2014-08-21 20:55:28 +00:00
Adam Lesinski
48f05d29f3 Add better error message for AAPT file conflicts 
Some resource directories may be the same even though
their names are different. For instance, the
"smallest width" qualifier was added in API 13,
so the resource directory "values-sw600dp" and
"values-sw600dp-v13" are the same and cause
a conflict. The error reports that this might be the
case.

Change-Id: Ia35f1d670edd48265b3a7fe3d55656128421f612
 2014-08-21 20:54:01 +00:00
Chris Craik
759f780af0 Merge "Enable scissor for rounded outline clips" into lmp-dev 2014-08-21 20:48:53 +00:00
Chris Craik
79d26c72aa Enable scissor for rounded outline clips 
bug:17164074

Change-Id: I83ca428f4d7651c6774ab81ac390477fb90c5d38
 2014-08-21 13:47:08 -07:00
Dianne Hackborn
b1a8a89697 Work on issue #16683269: system_server still leaking memory 
Fix a small temporary leak of app crash dialogs, which weren't
removing their timeout message.

Change-Id: Iee90b5fa2be700e3006388f32145ce4b14baa2ec
 2014-08-21 13:44:19 -07:00
Adam Lesinski
54ff554ed6 am e623df3a: Merge "Update Split example with application icon" into lmp-dev 
* commit 'e623df3ad126bc72bedfb2080f129ee7e90e9336':
  Update Split example with application icon
 2014-08-21 20:43:52 +00:00
Adam Lesinski
837fb15af8 am 435afbc5: Merge "Report the right resource version in am get-config" into lmp-dev 
* commit '435afbc522f2055aa211fd827acd56875e28f708':
  Report the right resource version in am get-config
 2014-08-21 20:43:47 +00:00
Matthew Williams
9dec720ec9 am 7a67b0c9: JobScheduler needs to flush queue on charging 
* commit '7a67b0c9d0b397fadcf0d4feca2ab80e462df48e':
  JobScheduler needs to flush queue on charging
 2014-08-21 20:43:42 +00:00
Ronghua Wu
5b9305fe9b MediaHTTPConnection: handles cross protocol redirects. 
Bug: 16899444
Bug: 17106630

Change-Id: I7e416447abffcae31c65fd469ee5f9fc867b4cdc
 2014-08-21 13:42:00 -07:00
Adam Lesinski
bfecd904bf Merge "Update Split example with application icon" into lmp-dev 2014-08-21 20:39:27 +00:00
Jason Monk
19310f5c01 am cc300347: Merge "Write device owner name to XML" into lmp-dev 
* commit 'cc3003479741e0ab195a0fbb6cdbbddb0130fffa':
  Write device owner name to XML
 2014-08-21 20:39:20 +00:00
Adam Lesinski
b5136731b2 Merge "Report the right resource version in am get-config" into lmp-dev 2014-08-21 20:39:00 +00:00
Matthew Williams
bafeeb9813 JobScheduler needs to flush queue on charging 
Also make it illegal to schedule a job with no constraints.
BUG: 16877705
Change-Id: Iae57286bc4f73163a7e3c9d2d531623fd50f1f72
 2014-08-21 20:37:06 +00:00
John Reck
330d836266 am 44de04b8: Merge "Don\'t run animators in buildLayer" into lmp-dev 
* commit '44de04b8d4642c62836499fcefe4d431abd4fe2f':
  Don't run animators in buildLayer
 2014-08-21 20:28:45 +00:00
John Reck
6237df8a02 am 25f606a0: Merge "Fix supporting modifying listeners in callbacks" into lmp-dev 
* commit '25f606a063006e7d38e5150b73b511e8d69b563e':
  Fix supporting modifying listeners in callbacks
 2014-08-21 20:28:41 +00:00
Jason Monk
de3af82ce0 Merge "Write device owner name to XML" into lmp-dev 2014-08-21 20:28:10 +00:00
John Reck
7d37344915 Merge "Don't run animators in buildLayer" into lmp-dev 2014-08-21 20:26:18 +00:00
Elliott Hughes
fbc4a34a20 Don't say "Arabic (Egypt)" in Settings. 
Nexus devices only ship one Arabic locale: ar_EG. This should probably be
changed to ar_001 in a later release (and, really, we should let users
choose _all_ of the Arabic-speaking countries), but there's no time for L.

This adds ar_EG to the list of special cases for LocalePicker so that
we'll show "Arabic" instead of "Arabic (Egypt)" (the actual change uses
the Arabic for "Arabic", obviously).

If you're an OEM trying to ship multiple Arabic locales, please accept
my apologies for making your lives slightly harder and, yes, this is the
patch you want to revert so that ar_EG shows up as "Arabic (Egypt)" again.

Bug: 17150708
Change-Id: Iea2fdf813bf3d7758e667bb1a8134a612ee0317b
 2014-08-21 13:23:43 -07:00