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

212695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
d62b9fc172 am 6136d306: am 0035f2ce: am 403eaaf2: am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit '6136d30641aae3f679aa768b7e8ed6d1025510cf':
  MIDI docs: fix buffer allocation
 2015-08-22 01:38:12 +00:00
Cheryl Potter
2d60fd1111 am 8b394af7: (-s ours) am 0be53aef: am c4b0028e: am a4f65ff5: am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 
* commit '8b394af7e65269152fc77a4cc3a4ba68a8f1bbd9':
  docs: changed red to yellow in code snippet
 2015-08-22 01:38:05 +00:00
Blazej Magnowski
c3866bf81f Merge "System to track touch and sensor events before unlocking the phone" 2015-08-22 01:25:18 +00:00
Fyodor Kupolov
3a22ad0ac4 am 09dbd46a: am 037281d4: am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 
* commit '09dbd46af8faa60419a97e926463dc25fbd0513f':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
 2015-08-22 01:22:32 +00:00
Adrian Roos
cb20f55415 am f83da111: am b51e34c3: am fb6f6f24: am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev 
* commit 'f83da11131cfa0069fd4d455a74379968a7772ee':
  Invoke strong auth callback and default strong auth expired to true
 2015-08-22 01:22:25 +00:00
Jim Miller
c7506b3718 am e271d91e: am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 
* commit 'e271d91e5f4a3941b654d41c87cb88f812a5d711':
  Fix type-o in FingerprintManager documentation
 2015-08-22 01:22:18 +00:00
Trevor Bunker
44f50b3604 am 421244f4: am b1dded03: am e2fb50b2: am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev 
* commit '421244f4e369ac49d2f32a66c0a0c85c861c1b56':
  Add support for new window orientation sensor.
 2015-08-22 01:22:12 +00:00
Adrian Roos
e3b07451c3 resolved conflicts for merge of bcc26c02 to master 
Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388
 2015-08-21 18:08:58 -07:00
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
Glenn Kasten
6136d30641 am 0035f2ce: am 403eaaf2: am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit '0035f2ceba00d1ba52b34b94e491eb6899060902':
  MIDI docs: fix buffer allocation
 2015-08-22 00:41:20 +00:00
Cheryl Potter
8b394af7e6 am 0be53aef: am c4b0028e: am a4f65ff5: am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 
* commit '0be53aef4db065f7b41aeb4bbb14e3969571ba80':
  docs: changed red to yellow in code snippet
 2015-08-22 00:41:15 +00:00
Fyodor Kupolov
09dbd46af8 am 037281d4: am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 
* commit '037281d4a9a22fa55b643e785ff32144cfa61591':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
 2015-08-22 00:41:08 +00:00
Adrian Roos
f83da11131 am b51e34c3: am fb6f6f24: am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev 
* commit 'b51e34c35f5ef979cfc8ea6b1dfec7fc97c15a9a':
  Invoke strong auth callback and default strong auth expired to true
 2015-08-22 00:41:04 +00:00
Jim Miller
e271d91e5f am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 
* commit '7225af947233f506d40500ab30a8c93bd1a603a5':
  Fix type-o in FingerprintManager documentation
 2015-08-22 00:40:58 +00:00
Trevor Bunker
421244f4e3 am b1dded03: am e2fb50b2: am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev 
* commit 'b1dded03df8eabf79ecbfe0771ab4ac76446e3bf':
  Add support for new window orientation sensor.
 2015-08-22 00:40:52 +00:00
Adrian Roos
bcc26c0201 am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker 
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
  Add StrongAuthTracker
 2015-08-22 00:40:47 +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
Glenn Kasten
0035f2ceba am 403eaaf2: am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit '403eaaf2d00ff705421f75ae5618b24ea1b2557d':
  MIDI docs: fix buffer allocation
 2015-08-22 00:27:17 +00:00
Cheryl Potter
0be53aef4d am c4b0028e: am a4f65ff5: am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 
* commit 'c4b0028e6f71a7bfcce4c15b2e62186ba78a0aeb':
  docs: changed red to yellow in code snippet
 2015-08-22 00:27:11 +00:00
Fyodor Kupolov
037281d4a9 am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 
* commit '563f974d97232706743ac415c65238b1c84ec1d5':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
 2015-08-22 00:27:05 +00:00
Adrian Roos
b51e34c35f am fb6f6f24: am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev 
* commit 'fb6f6f2490372f113698d9c8d09dae7f4991dec3':
  Invoke strong auth callback and default strong auth expired to true
 2015-08-22 00:26:58 +00:00
Jim Miller
7225af9472 am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 
* commit 'c66a0db280d5b8f21e7335b964f13cf6b765f336':
  Fix type-o in FingerprintManager documentation
 2015-08-22 00:26:52 +00:00
Trevor Bunker
b1dded03df am e2fb50b2: am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev 
* commit 'e2fb50b21d67decc555b6f89dea1d56fe8ee6655':
  Add support for new window orientation sensor.
 2015-08-22 00:26:45 +00:00
Adrian Roos
69fd61cb9a am a8bbebd4: am b5e47228: Add StrongAuthTracker 
* commit 'a8bbebd426b554378cedf3d4e729cabd7e0caff9':
  Add StrongAuthTracker
 2015-08-22 00:26:39 +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
Glenn Kasten
403eaaf2d0 am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit 'c445438e64d713ceb45937de17f7ab2fa34fe295':
  MIDI docs: fix buffer allocation
 2015-08-22 00:17:53 +00:00
Cheryl Potter
c4b0028e6f am a4f65ff5: am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 
* commit 'a4f65ff5e0cd265ef28697dc17f451106a79f90d':
  docs: changed red to yellow in code snippet
 2015-08-22 00:17:48 +00:00
Fyodor Kupolov
563f974d97 am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 
* commit 'd7cdbd4d812f3d3501c37b7242a7038298c7ee14':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
 2015-08-22 00:17:44 +00:00
Adrian Roos
fb6f6f2490 am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev 
* commit '2c632c8831349d2c951c9addae05f080958f0604':
  Invoke strong auth callback and default strong auth expired to true
 2015-08-22 00:17:39 +00:00
Jim Miller
c66a0db280 am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 
* commit '1bbc2750bb58f397a0195540d50c44400c381441':
  Fix type-o in FingerprintManager documentation
 2015-08-22 00:17:22 +00:00
Trevor Bunker
e2fb50b21d am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev 
* commit 'fbcd78e6ed5cd0ba3c231aa412ad5b07dd2faa44':
  Add support for new window orientation sensor.
 2015-08-22 00:17:06 +00:00
Adrian Roos
a8bbebd426 am b5e47228: Add StrongAuthTracker 
* commit 'b5e4722891e7bbf2fffcd995af02838667a3abab':
  Add StrongAuthTracker
 2015-08-22 00:16:48 +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
Glenn Kasten
c445438e64 am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit 'd9eef3478ae2bea4d943082aaefd1a4a91a30600':
  MIDI docs: fix buffer allocation
 2015-08-21 23:32:32 +00:00
Glenn Kasten
d9eef3478a Merge "MIDI docs: fix buffer allocation" into mnc-dev 2015-08-21 23:27:08 +00:00
Cheryl Potter
a4f65ff5e0 am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 
* commit '41fc973c144287c010d6219ab82f2640ebaff9dc':
  docs: changed red to yellow in code snippet
 2015-08-21 23:12:47 +00:00
Fyodor Kupolov
d7cdbd4d81 am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 
* commit 'e6c64508aba566b5bd4ac9cd87a07358b13f5a06':
  Fixed a typo in convertRestrictionsToBundle JavaDoc
 2015-08-21 23:12:43 +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
Cheryl Potter
41fc973c14 am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 
* commit '251f24790757cf38bffbd6cec06c6503f99299dd':
  docs: changed red to yellow in code snippet
 2015-08-21 23:08:00 +00:00
Chris Craik
b9ce116dac Switch several enums to enum classes 
Change-Id: I00ecd0b61657196b51704f70ca31a9d1c1ac254e
 2015-08-21 23:05:44 +00:00
Fyodor Kupolov
e6c64508ab Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 2015-08-21 23:04:09 +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