Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
211,911 Commits 3 Branches 0 Tags
2235ecd5ec06e48bbcecb6f22a653e470d94dfef
Commit Graph

51286 Commits

Author SHA1 Message Date
Alan Viverette
2235ecd5ec am f8ac5c34: Merge "Reset the setOnKeyListener callback when view is destroyed" 
* commit 'f8ac5c3469e53a7934731cfb854efb2975251ab4':
  Reset the setOnKeyListener callback when view is destroyed
 2015-10-07 16:54:17 +00:00
Alan Viverette
f8ac5c3469 Merge "Reset the setOnKeyListener callback when view is destroyed" 2015-10-07 16:36:58 +00:00
Alan Viverette
8a0c8e78a7 am 6a06f12c: Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams" 
* commit '6a06f12c3fa6a84306dc17f60eb16cdc25bc34b5':
  Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams
 2015-10-07 16:34:35 +00:00
Alan Viverette
4524278bcb am 7de6ae15: Merge "To call TypedArray.recycle() when we are done with the array." 
* commit '7de6ae159e0652cabe57ea8814ce8633049644a2':
  To call TypedArray.recycle() when we are done with the array.
 2015-10-07 16:34:26 +00:00
Alan Viverette
6a06f12c3f Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams" 2015-10-07 16:23:36 +00:00
Alan Viverette
7de6ae159e Merge "To call TypedArray.recycle() when we are done with the array." 2015-10-07 16:22:36 +00:00
Jianing Wei
5a15b95291 am 98e0cec2: am 3c708be3: am 6ffe9f05: am 2813b0fa: Camera2: Update video stabilization API doc. 
* commit '98e0cec203cd5463c9dd314455ef02781e241b44':
  Camera2: Update video stabilization API doc.
 2015-10-02 08:26:54 +00:00
Jianing Wei
3c708be364 am 6ffe9f05: am 2813b0fa: Camera2: Update video stabilization API doc. 
* commit '6ffe9f05de81fab8e3cb4031a784e26c2c0acce1':
  Camera2: Update video stabilization API doc.
 2015-10-02 02:11:55 +00:00
Jianing Wei
6ffe9f05de am 2813b0fa: Camera2: Update video stabilization API doc. 
* commit '2813b0fae99fed1096dc23c3899e223459a54cec':
  Camera2: Update video stabilization API doc.
 2015-10-01 16:40:21 +00:00
Daniel Erat
f0e8744620 am d3e3d889: am c3f37589: Merge "Update instructions in IPowerManager.aidl." 
* commit 'd3e3d8896ea0f2eba1424b57ac8a5b5d9287000c':
  Update instructions in IPowerManager.aidl.
 2015-09-30 21:39:01 +00:00
Daniel Erat
d3e3d8896e am c3f37589: Merge "Update instructions in IPowerManager.aidl." 
* commit 'c3f37589e04a52c109c63f6411db444500d4f92c':
  Update instructions in IPowerManager.aidl.
 2015-09-30 21:30:31 +00:00
Daniel Erat
22f58762e1 Update instructions in IPowerManager.aidl. 
Clarify IPowerManager.aidl's instructions for keeping the
C++ implementation in sync.

Change-Id: Ic51a3844483031e71fe2cfa1d3e8a065df86d119
 2015-09-30 14:55:35 -06:00
Jeff Sharkey
5dfd06f7d0 am c2fa99ed: am 792a9cc3: am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev 
* commit 'c2fa99edf1591eca47ad678889cfd4924f2470a8':
  Relax auto-launch checks for GET_CONTENT.
 2015-09-30 20:27:36 +00:00
Jeff Sharkey
792a9cc3a5 am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev 
* commit '30fd0628970b418dea382b388120f52504ff2243':
  Relax auto-launch checks for GET_CONTENT.
 2015-09-30 20:11:22 +00:00
Jianing Wei
2813b0fae9 Camera2: Update video stabilization API doc. 
Bug: 23353979
Change-Id: I781006d1b6ebbdf522ebbf6acc35b2062aff76b6
 2015-09-29 16:04:14 -07:00
Jeff Sharkey
cc2ae6b421 Relax auto-launch checks for GET_CONTENT. 
When a developer wraps an intent with Intent.createChooser(), they're
indicating that the user should always be prompted, instead of using
any "always use" defaults.  A recent CL changed the chooser behavior
to ensure that UI is always shown in the case where there is only one
match.

However, this caused us to start prompting for the GET_CONTENT intent,
for which there is only ever one DocumentsUI system app.  Since that
app delivers on the createChooser() contract described above, we're
okay automatically launching it.

Bug: 24464358
Change-Id: I0279d3343479c134a35f41ddf3cb4204d0ae6a90
 2015-09-29 13:04:48 -07:00
Bryce Lee
979a22eaf9 am 6ad696c3: am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev 
* commit '6ad696c35b80f70f19de304b53bdbfc6f5a265d8':
  Add ThermalObserver system service to capture thermal state uevents.
 2015-09-26 06:55:22 +00:00
Ned Burns
99fa24ff71 am 11b87b91: am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed 
* commit '11b87b9109717b30729e2ce01ac5014ba91c1051':
  Kill ActivityView's background thread when it's destroyed
 2015-09-26 06:54:22 +00:00
Bryce Lee
f0740e0a2e Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev 2015-09-26 01:33:00 +00:00
Bryce Lee
bc58f59da6 Add ThermalObserver system service to capture thermal state uevents. 
Bug: 21445745
Change-Id: I980d60b66ca51942a1fd62502d6cf1f09208fc3a
 2015-09-25 16:43:01 -07:00
Ned Burns
1b69fcbf81 am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed 
* commit 'f4e1d10cd35a4c1f87ec6dc3e59a9d08e562ffca':
  Kill ActivityView's background thread when it's destroyed
 2015-09-25 21:10:09 +00:00
Gus Prevas
3197cd36fe am 41110261: am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev 
* commit '41110261bb4f9f733b579b3dc26d3d6de5642ef5':
  Adds an option to override RemoteViews transition.
 2015-09-25 18:09:41 +00:00
Jorim Jaggi
c594e9354a am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev 
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
  Deliver camera launch source for analytics
 2015-09-25 18:07:52 +00:00
Gus Prevas
b17d1e5e6a Merge "Adds an option to override RemoteViews transition." into cw-e-dev 2015-09-25 17:17:44 +00:00
Gus Prevas
1ed322b123 Adds an option to override RemoteViews transition. 
This change adds a configuration option,
"config_overrideRemoteViewsActivityTransition", which is false by
default and true on watches.  If it's true, when a RemoteViews
is clicked, it will use a new attribute on the active window animation
style, "activityOpenRemoteViewsEnterAnimation", to determine
the entry transition to use, instead of the current hard-coded
default.

Bug: 23534750
Change-Id: I91e92804a663ab71a3e46c3430fa579b87cc7931
 2015-09-25 13:10:52 -04:00
Jorim Jaggi
b7b9b31f69 am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev 
* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
  Deliver camera launch source for analytics
 2015-09-25 01:30:43 +00:00
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics 
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
 2015-09-24 16:32:09 -07:00
Ned Burns
f4e1d10cd3 Kill ActivityView's background thread when it's destroyed 
We were leaking background threads for every new ActivityView.

Change-Id: I7ce190843265567984f6cda9c85fef478b0ead38
 2015-09-23 20:19:16 -04:00
Todd Kennedy
898e6973ca am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev 
* commit '739bb7c694aee521995100c456cf1c8341820bec':
  save "retain loader" state
 2015-09-23 18:05:58 +00:00
Todd Kennedy
e16fb554dd save "retain loader" state 
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.

Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
 2015-09-22 10:16:42 -07:00
Todd Kennedy
d65fc9c460 am d8b47855: save "retain loader" state DO NOT MERGE 
* commit 'd8b47855a316700751f7daead0b180005853be33':
  save "retain loader" state DO NOT MERGE
 2015-09-22 07:27:18 +00:00
Todd Kennedy
d8b47855a3 save "retain loader" state DO NOT MERGE 
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.

Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
(cherry picked from commit c5ac16f531)
 2015-09-22 07:19:14 +00:00
Erik Kline
5bcd4477dd am 2a068606: am c89f3a48: am 7aa79efe: Grab a wakelock while doing ARP/ND probing 
* commit '2a06860609254ab07ac7c866d8a7435a4245a9f0':
  Grab a wakelock while doing ARP/ND probing
 2015-09-21 12:15:39 +00:00
Erik Kline
c89f3a4833 am 7aa79efe: Grab a wakelock while doing ARP/ND probing 
* commit '7aa79efe80b790eef61ac355c0ce6c7b606e6f78':
  Grab a wakelock while doing ARP/ND probing
 2015-09-21 12:00:25 +00:00
Erik Kline
7aa79efe80 Grab a wakelock while doing ARP/ND probing 
Bug: 23197666
Change-Id: I5bf6e83b37fcd924f5f8e750f65bb5061f931e56
 2015-09-21 14:59:05 +09:00
Justin Harrison
46db0f2215 am 08b00423: am 1f463957: am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev 
* commit '08b004233537f625044b3f01e2923b600a9aa77c':
  Add support for setting color transforms
 2015-09-19 00:46:19 +00:00
Justin Harrison
1f46395702 am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev 
* commit '91f2123b2a6d534372ab9b7c8e6ac0c62cf33ae6':
  Add support for setting color transforms
 2015-09-19 00:29:40 +00:00
Justin Harrison
91f2123b2a Merge "Add support for setting color transforms" into mnc-dr-dev 2015-09-19 00:21:41 +00:00
Michael Wright
58e829f71d Add support for setting color transforms 
Bug: 24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
 2015-09-18 23:37:28 +00:00
Christine Hallstrom
c4f196b661 am 039fd00f: am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev 
* commit '039fd00fd2b499a871be8551d80d299120ff5595':
  Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
 2015-09-18 22:06:38 +00:00
Christine Hallstrom
13c23df90c Merge "Manual 'cherry pick' to fix CTS tests for MediaControllerTest." into cw-e-dev 2015-09-18 21:29:09 +00:00
Christine Hallstrom
2eb7d4761e Manual 'cherry pick' to fix CTS tests for MediaControllerTest. 
This is to manually apply a patch of code that should have
propagated to E, but hasn't and is breaking one of the CTS
tests for MediaControllerTest on Nemo.

The original reverted change can be found at ag/723643.

Bug: 24172957
Change-Id: I925ff561a56531ebf9f8d8b4ce56156ae7feb9fc
 2015-09-18 21:27:38 +00:00
Adam Lesinski
4092eeb7f7 am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 
* commit '069594f96a3c70b01119f689f2195e0d933c0700':
  BatteryStats: Better big-little CPU accounting
 2015-09-18 21:02:27 +00:00
Adam Lesinski
4e86aae667 am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 
* commit '680553957e4ff47343334881c34de6969b2ed977':
  BatteryStats: Better big-little CPU accounting
 2015-09-18 20:38:02 +00:00
Adam Lesinski
680553957e Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 2015-09-18 20:26:07 +00:00
Alan Viverette
c602c57737 am 48c7e6f3: am 24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()" 
* commit '48c7e6f3dc0462f43657b6003e4ba4021b0544ed':
  prevent unnecessary warning logs caused by View.toString()
 2015-09-18 20:19:27 +00:00
Alan Viverette
48c7e6f3dc am 24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()" 
* commit '24ff6823c411f794aceaae89b0b029fbf8ef6b29':
  prevent unnecessary warning logs caused by View.toString()
 2015-09-18 20:11:44 +00:00
Alan Viverette
24ff6823c4 Merge "prevent unnecessary warning logs caused by View.toString()" 2015-09-18 19:59:20 +00:00
kenzyun_chen
90ebb99b36 prevent unnecessary warning logs caused by View.toString() 
If the id is negative, it is not from Resource.
Passing the negative value to getResourcePackageName makes AssetManager dump unnecessary warning logs.
It is reasonable not to get package/type/entry information for the negative id.

The warning logs :
W/ResourceType( 3711): No known package when getting name for resource
number 0x9b010100

Change-Id: Ic89acb4f32205ba5a2fdac61dc14b00ccf251148
 2015-09-18 18:30:30 +08:00
Tim Murray
0816319a29 am 4816ea0e: am a02f9823: am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev 
* commit '4816ea0e120fd4e2892d372f33c8ca21e4b2efb6':
  Send power hint on fling gestures.
 2015-09-17 02:51:39 +00:00