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

212646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chong Zhang
be1ad3bdcb Merge "Move stack focus and resumed activity when moving a focused task" 2015-08-22 00:59:54 +00:00
Jorim Jaggi
4b27011c6d am ab023c90: am a1415360: am 2021956a: am ab45a217: Make wake-and-unlock faster 
* commit 'ab023c901598ffb478a78550874cb692217a82a8':
  Make wake-and-unlock faster
 2015-08-22 00:51:41 +00:00
Jorim Jaggi
ab03badef9 am ff35aa2e: am 60146356: am 83526e3b: am 86bed406: Fix fingerprint listening state race conditions 
* commit 'ff35aa2ec14fe17853bd4edacc7dd9171e8b32f3':
  Fix fingerprint listening state race conditions
 2015-08-22 00:51:35 +00:00
Jorim Jaggi
ab023c9015 am a1415360: am 2021956a: am ab45a217: Make wake-and-unlock faster 
* commit 'a1415360d739a382bde8efa2fdb9cce4a1e8c00e':
  Make wake-and-unlock faster
 2015-08-22 00:40:42 +00:00
Chong Zhang
02898359b9 Move stack focus and resumed activity when moving a focused task 
Also do not force focus when moving an activity to a stack. Focus
will be moved if the task was in front before. Focus shouldn't
be moved if the task was background.

bug: 23041817
Change-Id: I8f15c51cd38fea8bd1845b5268a7f153c1476462
 2015-08-21 17:40:38 -07:00
Jorim Jaggi
ff35aa2ec1 am 60146356: am 83526e3b: am 86bed406: Fix fingerprint listening state race conditions 
* commit '6014635635cf1b41319413fdd6984ae1207dc397':
  Fix fingerprint listening state race conditions
 2015-08-22 00:40:35 +00:00
Jorim Jaggi
a1415360d7 am 2021956a: am ab45a217: Make wake-and-unlock faster 
* commit '2021956a1c35dba2b88257dc4a8eed8fa0acd650':
  Make wake-and-unlock faster
 2015-08-22 00:26:31 +00:00
Jorim Jaggi
6014635635 am 83526e3b: am 86bed406: Fix fingerprint listening state race conditions 
* commit '83526e3bbdff8e8ca3f85616d0678eb5d00ae3b7':
  Fix fingerprint listening state race conditions
 2015-08-22 00:26:24 +00:00
Jorim Jaggi
2021956a1c am ab45a217: Make wake-and-unlock faster 
* commit 'ab45a217b0002dcf586d529ab8581cacbbfc37e9':
  Make wake-and-unlock faster
 2015-08-22 00:16:34 +00:00
Jorim Jaggi
83526e3bbd am 86bed406: Fix fingerprint listening state race conditions 
* commit '86bed40605e407459496ee2bfdf6b8af1ae1a581':
  Fix fingerprint listening state race conditions
 2015-08-22 00:16:29 +00:00
Chris Craik
8adc30a805 Merge "Add static asserts around assumed-static skia enum values" 2015-08-21 23:09:24 +00:00
Chris Craik
f145029113 Merge "Fixup DisplayListCanvas jni variable names" 2015-08-21 23:09:09 +00:00
Chris Craik
71c10ee8be Merge "Switch several enums to enum classes" 2015-08-21 23:08:39 +00:00
Chris Craik
b9ce116dac Switch several enums to enum classes 
Change-Id: I00ecd0b61657196b51704f70ca31a9d1c1ac254e
 2015-08-21 23:05:44 +00:00
Stephen Hines
d7ba5795be am 3954d395: resolved conflicts for merge of da1173f4 to mnc-dr-dev-plus-aosp 
* commit '3954d39547c2580e712c0213681b488bf0eb2714':
  Don't make bad RS API level recommendations.
 2015-08-21 23:02:42 +00:00
Stephen Hines
3954d39547 resolved conflicts for merge of da1173f4 to mnc-dr-dev-plus-aosp 
Change-Id: Iaeae433481d4059162fa79f14a38f3cac9fe9db2
 2015-08-21 15:57:56 -07:00
Filip Gruszczynski
1d4d5a6587 Merge "Split WMS.handleAppTransitionReadyLocked." 2015-08-21 22:41:33 +00:00
Chris Craik
216048ffb0 Add static asserts around assumed-static skia enum values 
Protects assumptions around enums value built into LUTs

Change-Id: Ica0692e4309d50b4d3897e0f3f47809d14f786fe
 2015-08-21 15:32:58 -07:00
Stephen Hines
da1173f4e1 am 582d1668: Merge "Don\'t make bad RS API level recommendations." 
* commit '582d16681bf46eb2f11c24132ffbcd9f7cc4b74d':
  Don't make bad RS API level recommendations.
 2015-08-21 22:08:37 +00:00
Stephen Hines
582d16681b Merge "Don't make bad RS API level recommendations." 2015-08-21 21:57:37 +00:00
Chris Craik
86c03ca534 Fixup DisplayListCanvas jni variable names 
Change-Id: I279833f5fe4525ebbab3330c5b36582560ca87e9
 2015-08-21 14:05:06 -07:00
Chris Craik
655c5d4c70 Merge "Revert "Revert "Simplify TextureView draw path""" 2015-08-21 20:28:46 +00:00
Filip Gruszczynski
d970f54555 Split WMS.handleAppTransitionReadyLocked. 
Not only some pieces can be split into smaller pieces, but it also
reveals some variables that can be removed or their scope narrowed.

Change-Id: I44c8c9a2535f857c666d5c4a521204e820dbc60b
 2015-08-21 12:43:26 -07:00
Jorim Jaggi
ab45a217b0 Make wake-and-unlock faster 
- Scrims: When dismissing Keyguard, don't wait until the next frame
to start the animation. Saves 16ms
- Scrims: Skip first frame, because it's completely black anyways.
Saves 16ms.
- Don't wait with navigation bar to show until the screen has turned
on. Window manager is blocked on DisplayPowerController anyways, so
the animation will exactly be started when the screen turns on. Fixes
some jank as well.
- Window manager: Don't wait for the window below Keyguard for draw
completion until turning on screen. Saves a lot of time depending on
how the app is behaving.

Bug: 23401557
Change-Id: I9734f9a12143f0e3c0647e9aa066831a29a6de63
 2015-08-21 19:29:30 +00:00
Jorim Jaggi
86bed40605 Fix fingerprint listening state race conditions 
When calling cancel() on the cancellation signal, it doesn't happen
immediately. Now, because of a state messup during boot, we go
through the sequence

startListeningForFingerprint
stopListeningForFingerprint
startListeningForFingerprint

However, the cancellation callback from stopListeningForFingeprint
happened AFTER the second startListeningForFingerprint, so we assumed
that fingerprint detection was not running anymore but in reality it
was - leading to weird states and all kinds of small state messups.

Introduce a state machine to track when we we called cancel but
waiting for the confirmation of FingerprintService in order to track
this properly.

Bug: 23380500
Change-Id: I403479fb749cf7c22b73611b69698e8b771777d0
 2015-08-21 19:29:05 +00:00
Roozbeh Pournader
4bae2038cd Merge "Cleanup android.text.TextUtils a little." 2015-08-21 19:04:29 +00:00
Tom Cherry
bbb74906be am fe0fcf5c: am b9ac485a: am 49948146: Merge "bundle init.rc contents with its service" 
* commit 'fe0fcf5cad75c6ba717a3d0a4ddb7c6bc656135d':
  bundle init.rc contents with its service
 2015-08-21 18:32:07 +00:00
Tom Cherry
fe0fcf5cad am b9ac485a: am 49948146: Merge "bundle init.rc contents with its service" 
* commit 'b9ac485a8e49a4db080bab8ea684a9b262215563':
  bundle init.rc contents with its service
 2015-08-21 18:24:35 +00:00
Tom Cherry
b9ac485a8e am 49948146: Merge "bundle init.rc contents with its service" 
* commit '49948146dc7449bd9caaae283413ec76633ec021':
  bundle init.rc contents with its service
 2015-08-21 17:57:31 +00:00
Tom Cherry
49948146dc Merge "bundle init.rc contents with its service" 2015-08-21 17:42:30 +00:00
Chris Craik
3aadd60521 Revert "Revert "Simplify TextureView draw path"" 
Fixed build breakage

This reverts commit d35dcb13115ca1dd8c07e397f43a186cd7fd1a01.

Change-Id: Id3a103fbaac15a05f558bce2161ce17b6e8d2ea3
 2015-08-21 10:33:02 -07:00
Roozbeh Pournader
999da7464a Merge "Update tests and support negative values in formatBytes()." 2015-08-21 17:21:11 +00:00
Alan Viverette
4dce463cfc Merge "Scroll handle should have intrinsic width and height" 2015-08-21 17:18:52 +00:00
Chris Craik
2f967f3e41 Merge "Remove return values from clipping operations" 2015-08-21 16:50:22 +00:00
Rob Carr
4d832d7525 Merge "ActivityManagerService: Rather than throw an exception, return INVALID_STACK_ID from getWorkspaceId when there is no associated workspace. This leaves the caller free to default." 2015-08-21 16:21:51 +00:00
Robert Carr
49cbf6ba24 ActivityManagerService: Rather than throw an exception, return 
INVALID_STACK_ID from getWorkspaceId when there is no associated
workspace. This leaves the caller free to default.

PhoneWindow: Default to FULLSCREEN_WORKSPACE_STACK_ID in the case
of INVALID_STACK_ID returned from the ActivityManagerService.

Bug: #23171731

Change-Id: Id5132337459bd2ef81b2416434d7657b6f3d1855
 2015-08-21 16:21:09 +00:00
Clara Bayarri
0b578f90fa Merge "Fix TextViewTest#testProcessTextActivityResultNonEditable" 2015-08-21 15:08:02 +00:00
Alan Viverette
c22e01920f Scroll handle should have intrinsic width and height 
Bug: 23349046
Change-Id: I8eab751d0df37aa81848159f847d2ff32a903cff
 2015-08-21 10:54:54 -04:00
Nicolas Prévot
3e465f9c8c Merge "Clear cross-profile intent filters in the right user." 2015-08-21 14:49:09 +00:00
Clara Bayarri
d7e48e1e21 Fix TextViewTest#testProcessTextActivityResultNonEditable 
BUG: 23404902
Change-Id: I0b70d3895d0dbfb66fa64a0f7a5cc6c21ace122f
 2015-08-21 15:23:24 +01:00
Nicolas Prevot
4afb83e912 Clear cross-profile intent filters in the right user. 
Clear them in the parent, who is not always the owner.

BUG:23105562
Change-Id: Iae2adbfa6b4d6e982f6f2a4075dd8bd55b11c37e
 2015-08-21 15:19:53 +01:00
Svetoslav Ganov
dec9a216d2 am f18cbd76: am c9dec164: am e96b80f3: am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit 'f18cbd760142e627ab6c9672e4aca3a29d05d9ee':
  Add missing removed permissions to the platform manifest
 2015-08-21 13:07:38 +00:00
Svetoslav Ganov
f18cbd7601 am c9dec164: am e96b80f3: am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit 'c9dec164609471227d519cf97df89a8049907065':
  Add missing removed permissions to the platform manifest
 2015-08-21 13:01:50 +00:00
Svetoslav Ganov
c9dec16460 am e96b80f3: am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit 'e96b80f3deb7a49225112d497dcf75cc4211b092':
  Add missing removed permissions to the platform manifest
 2015-08-21 12:55:58 +00:00
Svetoslav Ganov
e96b80f3de am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit '446c00a2919da5b4ea0bdf08f72ac4f95125ea45':
  Add missing removed permissions to the platform manifest
 2015-08-21 12:49:42 +00:00
Svetoslav Ganov
446c00a291 am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit 'cb59747de7222bc7310162c4174f7b460c34adef':
  Add missing removed permissions to the platform manifest
 2015-08-21 12:41:29 +00:00
Svetoslav Ganov
cb59747de7 Merge "Add missing removed permissions to the platform manifest" into mnc-dev 2015-08-21 12:34:37 +00:00
Sebastien Hertz
a2faffafc6 am 25e3ed83: (-s ours) am 0fbbe38b: am 36970140: am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '25e3ed8334a6a6df525862425ec510296f9ad8c3':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:44:38 +00:00
Sebastien Hertz
25e3ed8334 am 0fbbe38b: am 36970140: am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '0fbbe38b86ff1747587e893f1824c068727b068f':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:37:48 +00:00
Sebastien Hertz
0fbbe38b86 am 36970140: am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '36970140f3ce6ce66f3873e2091841f97efdd390':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:30:41 +00:00