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

56069 Commits

Author SHA1 Message Date
Tim Murray
b2387e650b am 6c271b89: am f3acc630: am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev 
* commit '6c271b898c080303c24e524022dd6e4552bda5f5':
  Ensure SurfaceView requests WM relayout when size changes.
 2015-10-07 23:39:16 +00:00
Tim Murray
f3acc63015 am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev 
* commit '0135690688c8285e022a2a8191c8582f2e6ea759':
  Ensure SurfaceView requests WM relayout when size changes.
 2015-10-07 23:28:13 +00:00
Tim Murray
0135690688 Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev 2015-10-07 23:21:14 +00:00
Yin-Chia Yeh
cbb3dc67cf am 527da81f: am a71bb6b9: am 9d688336: am a636be6c: Camera: fix wrong FULL feature string 
* commit '527da81f13fa65b924859ae87f6ccce8d3614140':
  Camera: fix wrong FULL feature string
 2015-10-07 21:54:41 +00:00
Yin-Chia Yeh
a71bb6b986 am 9d688336: am a636be6c: Camera: fix wrong FULL feature string 
* commit '9d68833686e04ff5ff910a9d90fe99bc1347aaca':
  Camera: fix wrong FULL feature string
 2015-10-07 21:41:38 +00:00
Yin-Chia Yeh
9d68833686 am a636be6c: Camera: fix wrong FULL feature string 
* commit 'a636be6c9a8a9192f72a111c2b3084a226d37b7e':
  Camera: fix wrong FULL feature string
 2015-10-07 21:36:35 +00:00
Robert Carr
57caeb5703 Ensure SurfaceView requests WM relayout when size changes. 
In the case of scaled SurfaceViews with a fixed size.
It is possible for the surface layout size to change
without a change to the surface size or position. In this
case we need to inform the window manager so it can update
frames and scaling. This has presented in Camera and required
workarounds such as changing the fixed surface size to trigger
an update (leading to visual artifacts).

Bug:23974105
Change-Id: I195aa0832907c32874b294101b56e198e853dce5
(cherry picked from commit a8fe43f09c)
 2015-10-07 20:39:11 +00:00
Alan Viverette
b46886f41d am f518ad0a: Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup" 
* commit 'f518ad0a4941236b72b5d090320d4ab70ebbf26b':
  IndexOutOfBoundsException on addPreference in PreferenceGroup
 2015-10-07 16:54:26 +00:00
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
f518ad0a49 Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup" 2015-10-07 16:38:02 +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
Yin-Chia Yeh
a636be6c9a Camera: fix wrong FULL feature string 
Bug: 24678065
Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
 2015-10-06 13:45:20 -07: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
Jeff Sharkey
30fd062897 Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev 2015-09-30 16:22:17 +00:00
Adam Lesinski
67ee88e8ad am 8b7beaec: am 8197e2de: am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 
* commit '8b7beaecffde9a98b50cd33be893b7944f2ab271':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary
 2015-09-29 23:45:28 +00:00
Adam Lesinski
8197e2de06 am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 
* commit 'ffc6ce000568c08a50f7b538bd4cd7729e64c229':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary
 2015-09-29 23:30:27 +00:00
Adam Lesinski
ffc6ce0005 Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 2015-09-29 23:22:59 +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
Bill Rassieur
6e78bb42fc am 2711eb4c: am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev 
* commit '2711eb4c3950ee0b5776c07957f0af3c31aa1c67':
  Fix jank: Don't write lockout deadline if not needed
 2015-09-28 23:19:32 +00:00
Bill Rassieur
3de2d53a75 am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev 
* commit 'c25d546050423845c42a5e8cc8e356caa1f4f71a':
  Fix jank: Don't write lockout deadline if not needed
 2015-09-28 23:09:10 +00:00
Bill Rassieur
c25d546050 Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev 2015-09-28 23:02:46 +00:00
Jorim Jaggi
e3e6d56b94 Fix jank: Don't write lockout deadline if not needed 
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.

Bug: 24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
 2015-09-28 13:57:37 -07:00
Adam Lesinski
a57a540440 Fix asymmetry in parceling/unparceling code for BatteryStats summary 
Bug:24434303
Change-Id: I638979e54076004860035396738f6a1281e26c20
 2015-09-28 10:59:45 -07:00
Adam Lesinski
983c6d4d39 am b8126531: am d913782f: am d5f10154: Bump BatteryStats version 
* commit 'b8126531c4275b5caf0132930a2cfc14344c20ce':
  Bump BatteryStats version
 2015-09-28 07:12:49 +00:00
Adam Lesinski
d913782f1b am d5f10154: Bump BatteryStats version 
* commit 'd5f10154c772b925f6527e25aeb8461de8c710cd':
  Bump BatteryStats version
 2015-09-28 07:00:52 +00:00
Adam Lesinski
d5f10154c7 Bump BatteryStats version 
Bug:24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
 2015-09-27 21:28:43 +00: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
Todd Kennedy
389bb7f509 am 9f860264: resolved conflicts for 7de7e0b0 to stage-aosp-master 
* commit '9f8602644418ecfb1a5c9555792ceed285fa72bd':
  Pass dexopt flags as integer
 2015-09-25 22:17:06 +00:00
Todd Kennedy
9f86026444 resolved conflicts for 7de7e0b0 to stage-aosp-master 
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
 2015-09-25 15:06:49 -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
Todd Kennedy
fa54ab7950 Pass dexopt flags as integer 
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.

Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
 2015-09-25 13:52:33 -07: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