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

146622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
6ba042b514 Make returning ActivityOptions part of ActivityRecord. 
Bug 16626030

Getting the timing correct for when to clear returning activity options
was difficult when Activities can be destroyed and recreated. Moving
the returning ActivityOptions to the ActivityRecord forces the
ActivityOptions to only apply to the correct Activity.

Change-Id: Ib5400b157eb741ae484aae0cc83172a3db637a3e
 2014-07-28 19:56:09 +00:00
Alan Lau
77d6f36bbc Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
This reverts commit 0c87dfd25d5a305fb67eb328d114aada87055dd7.

Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
 2014-07-28 19:53:51 +00:00
Anish Athalye
a665380b60 am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit '1a408a344c7921d7c943826bea3ce0cdd822583d':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 19:53:26 +00:00
Alan Lau
af60e56b39 Revert "DO NOT MERGE Fix extraneous allocation and copying" 
This reverts commit 1a408a344c7921d7c943826bea3ce0cdd822583d.

Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
 2014-07-28 19:51:01 +00:00
Alan Lau
6b1e358cdb am fe27de2b: am 31503723: (-s ours) am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit 'fe27de2b07cdd4084ac2af5aeb898e3d5c126b71':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:22:04 +00:00
Anish Athalye
55e755c4c3 am 2c4e4e1d: am c51a6e45: (-s ours) am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit '2c4e4e1d8a7dd456f653a74f054f6c383d002a22':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:21:59 +00:00
Jorim Jaggi
2b2a8d4cf3 am 48189378: Clear all notifications improvements 
* commit '4818937806d0340513c8df50d6fcdcc7e417d4f9':
  Clear all notifications improvements
 2014-07-28 19:21:55 +00:00
Alan Lau
c50ffa6783 am 31503723: (-s ours) am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '315037234206c500e73a15075b996122316ce9d8':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:16:08 +00:00
Anish Athalye
572619b1c2 am c51a6e45: (-s ours) am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit 'c51a6e45e857ee42d122e898590eb815e568564d':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:16:04 +00:00
Jorim Jaggi
4b04a3a164 Clear all notifications improvements 
- Fix a bug with visibility.
- Improve fling behavior such that the shade open animation still
  looks like that we are decelerating towards the last card.

Change-Id: I1ad167ce0001ff6850f49e819bab944943fa529d
 2014-07-28 19:13:35 +00:00
Robert Greenwalt
e9f04745fa am 13c4ee0e: Merge "Remove dead code 1." into lmp-dev 
* commit '13c4ee0ec60bbad4b3b18aab0be3f9b31fe2c84b':
  Remove dead code 1.
 2014-07-28 19:12:47 +00:00
Alan Lau
3150372342 am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '97170e0c48bbff21ef6773110d950621131cf9dd':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:10:29 +00:00
Anish Athalye
c51a6e45e8 am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit 'a28e4764994283c3595dd41f12e425cf7dc0d985':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:10:19 +00:00
Anish Athalye
1a408a344c DO NOT MERGE Fix extraneous allocation and copying 
With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.

Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
(cherry picked from commit 733b3c0f8b77fefcd234c94170faa4e7bd76074c)
 2014-07-28 19:06:10 +00:00
Sreeram Ramachandran
ed0df24e4a am a62c7010: Prohibit address families by default unless a VPN explicitly allows them. 
* commit 'a62c7010b1971e797cedcd36a029e94f4b62ac55':
  Prohibit address families by default unless a VPN explicitly allows them.
 2014-07-28 18:58:37 +00:00
Sreeram Ramachandran
42065ac64c Prohibit address families by default unless a VPN explicitly allows them. 
Bug: 15972465
Change-Id: I3278d94536fefacc86390c1ba4231680f7be8589
 2014-07-28 18:52:41 +00:00
Zhijun He
1e5c5f04b0 am 890a8285: ImageFormat: update raw10 spec to allow row padding 
* commit '890a8285a8526a766458c3ee814ae915f87cc42b':
  ImageFormat: update raw10 spec to allow row padding
 2014-07-28 18:49:30 +00:00
Anish Athalye
a28e476499 DO NOT MERGE Fix line breaking for clusters in narrow views 
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.

Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit 162713dd0b72af79c1b2286985f7e79f043cd915)
 2014-07-28 18:47:40 +00:00
Zhijun He
4c4064fa66 ImageFormat: update raw10 spec to allow row padding 
Change-Id: Id191b92037487f16538d111fc6171d3be9a02acf
 2014-07-28 18:42:10 +00:00
Dake Gu
06cb5edac9 Merge "Transition: Don't suppressLayout(false) for returning activity" into lmp-dev 2014-07-28 18:28:56 +00:00
Dake Gu
09d9c3be8a Transition: Don't suppressLayout(false) for returning activity 
Change-Id: I7be8a779ab8996809b36baa107acd55ab872580c
 2014-07-29 11:34:35 -07:00
Alan Viverette
57b69dd27e Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 2014-07-28 18:28:56 +00:00
Alan Viverette
500c56089f Partial revert "Add better errors for unresolved attributes, remove unused code" 
This reverts commit 0e42f4b98752b6457b04887e2a557fa007da73d7.

Change-Id: Ic3f0cb709c7aaa0a9892d728311886714ba73f22
 2014-07-29 11:30:35 -07:00
John Reck
591a824c5d Merge "Add layer/texture creation tracing" into lmp-dev 2014-07-28 18:28:56 +00:00
John Reck
ec4cefc152 Add layer/texture creation tracing 
Change-Id: I0af6a36c97a9f5f35d28e0e36539ba8d8011ea7c
 2014-07-29 10:04:01 -07:00
Yorke Lee
f83fdd0864 Merge "Add new proximity sensors in Telecomm (1/3)" into lmp-dev 2014-07-28 18:28:56 +00:00
Yorke Lee
0d6ea71bcf Add new proximity sensors in Telecomm (1/3) 
Add the following two APIs in Telecomm and use them in InCallUI
setProximitySensorOn
setProximitySensorOff(boolean turnScreenOnImmediately)

Bug: 16573954
Change-Id: I8219e9c659f4ea4493f5cd5c8bcaa95a98d180e2
 2014-07-29 09:27:31 -07:00
Ricardo Cervera
652e5c7ef1 Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 2014-07-28 18:28:56 +00:00
Robert Greenwalt
a346442057 Merge "Remove dead code 2." into lmp-dev 2014-07-28 18:28:56 +00:00
Robert Greenwalt
6831f1d80f Remove dead code 2. 
Removing ConnectivityService.NetworkFactory.  This requires disabling
the ConnectivityServiceTest, but that's been broken since we stopped
using NetworkStateTrackers anyway.

Change-Id: I9b86bd37eb9d018c40f60dca5b00d62c36d4e3ad
 2014-07-28 14:48:52 -07:00
vandwalle
57188b8908 Merge "introduce WifiConnectionstatistics" into lmp-dev 2014-07-28 18:28:56 +00:00
vandwalle
4eeecb2550 introduce WifiConnectionstatistics 
This CL is dependent on I10584a447fecd977df3eefd8e2cc028bd26ec0e3

Change-Id: I51fbbf062feb22c5f16b438675519064cc43e160
 2014-07-28 21:20:55 +00:00
George Mount
a7dc1702af Merge "Allow changing bounds to and from a zero-sized bounds." into lmp-dev 2014-07-28 18:28:56 +00:00
Selim Gurun
d92e726cbe Merge "Revert "Load the WebView Java code from an APK." DO NOT MERGE" into lmp-dev 2014-07-28 18:28:56 +00:00
Ben Murdoch
64fb02956b Revert "Load the WebView Java code from an APK." DO NOT MERGE 
This reverts commit 72618c3363c83f2668dab4495b100a61d6d8700a.

Bug: 16448724
 2014-07-28 21:07:24 +01:00
Bo Liu
c15fbba494 Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 2014-07-28 18:28:56 +00:00
Sandeep Siddhartha
e6ab3a8bda am d2feddff: Use blob (shared memory) for large data in sound model/recognition event/config 
* commit 'd2feddff50f085524759254df7a0ca696e55951d':
  Use blob (shared memory) for large data in sound model/recognition event/config
 2014-07-28 18:16:42 +00:00
RoboErik
0df5d2a0c2 am 18e4171a: Merge changes I87f551a7,Icb8dc76c,I66fbf585,I0c9506e7 into lmp-dev 
* commit '18e4171a9a315007c8f2b82d5d9a9bf2415e2399':
  Add context to MediaController constructor
  Add getPackageName to MediaController
  Expose a way to set a PendingIntent for restarting playback
  Finish plumbing for launch intents in sessions
 2014-07-28 18:11:41 +00:00
RoboErik
06dfb211db am 654d1881: Merge "Add getFlags and getSessionToken to MediaController" into lmp-dev 
* commit '654d1881429272307df3e724548878b1e7e58dbe':
  Add getFlags and getSessionToken to MediaController
 2014-07-28 18:11:36 +00:00
Andrew Lee
3e182ee4ad am 81faa698: Move VideoCallProvider into ConnectionService. 
* commit '81faa6989cbd60a403fc04a9fe0faf0e475869d1':
  Move VideoCallProvider into ConnectionService.
 2014-07-28 18:11:26 +00:00
Sandeep Siddhartha
39c12fab49 Use blob (shared memory) for large data in sound model/recognition event/config 
Also add a missing null check in writeBlob

Bug: 16516353
Change-Id: Ie702f8daae541cab7c2cee6e13d49e7fc84c84e1
 2014-07-28 11:10:32 -07:00
Ricardo Cervera
321e030202 docs: Fix Wear docs issues. 
Bug: 16624918
Bug: 16626217
Bug: 16626415
Bug: 16624384
Bug: 16623147

Change-Id: I774f19aded22562b891f9d2ccc35f0befb50f21c
 2014-07-28 17:52:40 +00:00
Andrew Lee
1418576521 Move VideoCallProvider into ConnectionService. 
Bug: 16494880
Change-Id: I0778197d06fcd219db4a1e1fa065e69026254a99
 2014-07-28 10:41:37 -07:00
Vinit Deshpande
9f447122ed am 01bbc3c4: Merge "Enable RTT End-to-end" into lmp-dev 
* commit '01bbc3c4e14128614d201288614674f0800bddda':
  Enable RTT End-to-end
 2014-07-28 17:38:32 +00:00
Jean-Michel Trivi
d2023409ad am 11e17a18: Merge "AudioTrack transfer mode in JNI" into lmp-dev 
* commit '11e17a187c25efb1698871599e5b59f44fd1eaf8':
  AudioTrack transfer mode in JNI
 2014-07-28 17:38:26 +00:00
Alexandra Gherghina
e39bda1298 am 705b1376: Return a default icon from the package manager directly 
* commit '705b1376e20fac1cad0e89ea0bdaff815d9f499d':
  Return a default icon from the package manager directly
 2014-07-28 17:34:14 +00:00
Alexandra Gherghina
a71e3903e5 Return a default icon from the package manager directly 
Bug: 16369104
Change-Id: I2db300a69a08030eacc245ee91556f0443ba5878
 2014-07-28 17:30:56 +00:00
John Reck
df7e3afb8d am 408e5e2d: Merge "Avoid calling non-final methods in ctor" into lmp-dev 
* commit '408e5e2da0de207ac21630cc7b751a1b2500a9f3':
  Avoid calling non-final methods in ctor
 2014-07-28 16:52:11 +00:00
John Reck
3faa1911e3 am 2f0fd42e: Merge "Throw IAE on invalid scale" into lmp-dev 
* commit '2f0fd42ef1ab252b75f772763ca2624acf1f1156':
  Throw IAE on invalid scale
 2014-07-28 16:52:07 +00:00
Lorenzo Colitti
039ae9e4e7 am c98cb483: Add a getBoundURL method that returns a network-specific URL. 
* commit 'c98cb483435d6302e916eb7816e8b80d753c672f':
  Add a getBoundURL method that returns a network-specific URL.
 2014-07-28 16:26:24 +00:00