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

204948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
3a56566914 am 5c2bfa8f: am 58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev 
* commit '5c2bfa8ff08331a2a62a1dd7496331eb977c0f13':
  Start fingerprint authentication in onStartedGoingToSleep
 2015-09-18 00:55:09 +00:00
Jorim Jaggi
3ac7e49f23 am dc09ffad: am 5c0c5ac8: Handle case correctly when screen times out and locking immediately 
* commit 'dc09ffad2a7a68e96eadec0f81611b3538ef78a5':
  Handle case correctly when screen times out and locking immediately
 2015-09-18 00:55:02 +00:00
Jorim Jaggi
5c2bfa8ff0 am 58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev 
* commit '58e378b02561d8f606066537b193b0eb62e2404f':
  Start fingerprint authentication in onStartedGoingToSleep
 2015-09-18 00:48:47 +00:00
Jorim Jaggi
dc09ffad2a am 5c0c5ac8: Handle case correctly when screen times out and locking immediately 
* commit '5c0c5ac84552f80ddadc43f451c3a28c5c8c8f84':
  Handle case correctly when screen times out and locking immediately
 2015-09-18 00:48:41 +00:00
Jorim Jaggi
58e378b025 Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev 2015-09-18 00:41:31 +00:00
Jorim Jaggi
95e4038bb1 Start fingerprint authentication in onStartedGoingToSleep 
We used to start fingerprint authentication in onFinishedGoingToSleep.
This was a UX issue because then users couldn't place the finger on
the sensor immediately after pressing the power button because
onFinishedGoingToSleep is significantly delayed (around 900ms after
pressing the power button).

Bug: 23570959
Change-Id: I0bf557ebd10e6a8b033ab98a78aa338bf6538dcc
 2015-09-18 00:39:13 +00:00
Zach Riggle
cd8fc98287 am 3c9ffc2d: am 2ebcf2c2: am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev 
* commit '3c9ffc2d5ae7152ae8b303a7b3c8da0a2fc734cf':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-09-17 22:52:42 +00:00
Jorim Jaggi
5c0c5ac845 Handle case correctly when screen times out and locking immediately 
In case the the screen timed out and the setting was set to "lock now"
in case the screen times out, we locked before finished going to sleep,
leading to all kinds of state messups in Keyguard, including an empty
lockscreen when authenticating with fingerprint during that period.

Bug: 23952388
Change-Id: If1629be1171c841d51ec0555422e6108002fdb73
 2015-09-17 22:48:07 +00:00
Zach Riggle
3c9ffc2d5a am 2ebcf2c2: am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev 
* commit '2ebcf2c28fd1657a98a7dc4a90bcbe7e78f296e9':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-09-17 22:42:18 +00:00
Zach Riggle
2ebcf2c28f am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev 
* commit 'ad0acf1d104988238f431d874f0ecf9917a06699':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-09-17 22:33:34 +00:00
Zach Riggle
ad0acf1d10 am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev 
* commit '9836b64f529238d1219f1937abf481383cd0cacd':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-09-17 22:25:53 +00:00
Zach Riggle
9836b64f52 am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev 
* commit 'f68b1953259a13562f5a2331526edafae5c1d99f':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-09-17 22:17:11 +00:00
Zach Riggle
f68b195325 am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev 
* commit '683cd049f7c762251567a0e0386ee49bb1428351':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-09-17 22:00:29 +00:00
Zach Riggle
683cd049f7 resolved conflicts for 521def98 to lmp-mr1-dev 2015-09-17 17:34:08 -04:00
Bryce Lee
d5334121c4 am 2f8ac2a3: Fix build due to merge of duplicate variable. 
* commit '2f8ac2a35bbd81cd297d3ea3a1baaa554353e87e':
  Fix build due to merge of duplicate variable.
 2015-09-17 03:13:20 +00:00
Bryce Lee
2f8ac2a35b Fix build due to merge of duplicate variable. 
Change-Id: I1e8bad32b2118542408b6d8b87302861e3873d32
 2015-09-16 20:06:46 -07:00
Tim Murray
4816ea0e12 am a02f9823: am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev 
* commit 'a02f98239ea683b802ede31382f51eb88eda05d3':
  Send power hint on fling gestures.
 2015-09-17 02:42:53 +00:00
Tim Murray
a02f98239e am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev 
* commit '952d5b334ccdf9cab0f56673861906e59d4e9933':
  Send power hint on fling gestures.
 2015-09-17 02:33:35 +00:00
Tim Murray
952d5b334c Merge "Send power hint on fling gestures." into mnc-dr-dev 2015-09-17 02:24:32 +00:00
Michael Wright
a4d22d718a Send power hint on fling gestures. 
Use the existing PointerEventListener infrastructure to listen for
gestures that look like flings and hint to the power system when they
happen. Since we don't actually have a bound for the fling like a
regular application would, limit them to five seconds and refresh
every time a new fling is seen until the five second time period is
up.

bug 24059298

Change-Id: I5757a1e88f2ab2ef08cccefa8221d809ae71bb6f
 2015-09-17 00:18:13 +00:00
Jorim Jaggi
7de9e3ea4b am 09999fb9: am 18f18ae0: Allow camera launch also when device is interactive 
* commit '09999fb9741552544dc29daa06534e1409181c1c':
  Allow camera launch also when device is interactive
 2015-09-17 00:07:57 +00:00
Jorim Jaggi
09999fb974 am 18f18ae0: Allow camera launch also when device is interactive 
* commit '18f18ae078ee97bbdfc9da39d4a19866dceb6a3e':
  Allow camera launch also when device is interactive
 2015-09-16 23:56:25 +00:00
Jorim Jaggi
18f18ae078 Allow camera launch also when device is interactive 
Bug: 23967648
Change-Id: If91df75e6325b3969dc2351a70af0c160d3eab04
 2015-09-16 23:44:56 +00:00
Yuchao Zhou
c95668c5d4 am 88daa997: am c38ffecc: Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev 
* commit '88daa997fc609fdcbd1376657e3f18de4ca37193':
  Moving BTtraffic from experiment location to here
 2015-09-16 23:03:35 +00:00
Yuchao Zhou
88daa997fc am c38ffecc: Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev 
* commit 'c38ffecc348687ae30c5fa2dc1761d9138b406b6':
  Moving BTtraffic from experiment location to here
 2015-09-16 22:53:10 +00:00
Yuchao Zhou
c38ffecc34 Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev 2015-09-16 22:42:34 +00:00
Yuchao Zhou
2de4b74d80 Moving BTtraffic from experiment location to here 
Change-Id: I1b0ec7fba87a098aa6509bd9be3f0e0ff624bf6e
 2015-09-16 15:37:40 -07:00
Adam Powell
1ac3792491 am 4873c549: am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices 
* commit '4873c549f7f4c45237a6f1185dd29216157965df':
  Handle single-choice ChooserActivities and bound ChooserTargetServices
 2015-09-16 21:13:38 +00:00
Fyodor Kupolov
71b4b738a6 am d20f2106: am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 
* commit 'd20f21065036a50cf0ba8537746f68f713f20f8b':
  Use app directory as apkPath for cluster installs
 2015-09-16 21:13:31 +00:00
Jack Yu
08607194cf am 717e39df: am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev 
* commit '717e39df1c43806f3aa373f52c14f8b282f325b4':
  Added a carrier config key for emergency messages on/off option always showing.
 2015-09-16 21:13:23 +00:00
Adam Powell
4873c549f7 am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices 
* commit '39e94ebe22d4959facea4c3621a0a5377242a570':
  Handle single-choice ChooserActivities and bound ChooserTargetServices
 2015-09-16 21:02:58 +00:00
Fyodor Kupolov
d20f210650 am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 
* commit 'bfc584df683a84dffd8e04b7b13f619606a0a42a':
  Use app directory as apkPath for cluster installs
 2015-09-16 21:02:53 +00:00
Jack Yu
717e39df1c am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev 
* commit '870a9e6a783c7755b059d8533ae0232873bff9ba':
  Added a carrier config key for emergency messages on/off option always showing.
 2015-09-16 21:02:48 +00:00
Adam Powell
39e94ebe22 Handle single-choice ChooserActivities and bound ChooserTargetServices 
Fix cases where we could try to unbind from a ChooserTargetService
that is not connected. This could happen if we still had stale replies
coming back after the activity was destroyed.

Always offer users an explicit choice in ChooserActivity, don't
auto-start a single option.

Make sure we don't allow a wedged ChooserTargetService to hold a hard
reference to the ChooserActivity via its internal result callback.

Bug 23152483

Change-Id: I7c8b1fc9559dcd477702ef582011b088b07d646b
(cherry picked from commit 9761ab2a645a4643bd20619c7c148ef07e0dd39d)
 2015-09-16 19:54:24 +00:00
Fyodor Kupolov
bfc584df68 Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 2015-09-16 19:37:47 +00:00
Jack Yu
870a9e6a78 Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev 2015-09-16 19:15:49 +00:00
Chris Tate
e46bf3f7f2 am ee16be69: am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev 
* commit 'ee16be69f1c3b3a9d6cdcb8bde70be3f7a0dbb65':
  Do not back up/restore the "pulse LED for notifications" setting
 2015-09-16 17:19:34 +00:00
Chris Tate
ee16be69f1 am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev 
* commit '3290f5dd067557727f166ff7a51ad2b5209622f6':
  Do not back up/restore the "pulse LED for notifications" setting
 2015-09-16 17:11:19 +00:00
Chris Tate
3290f5dd06 Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev 2015-09-16 17:05:07 +00:00
Andres Morales
8d9ba68498 am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev 
* commit '5b78fda91e33b4fc8de5f0a8ab894941202c42cb':
  reset lockout deadline on device reboot
 2015-09-16 16:18:25 +00:00
Andres Morales
5b78fda91e am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev 
* commit '38e6e4ef98ea1f116902725c282df9fb061a224e':
  reset lockout deadline on device reboot
 2015-09-16 16:12:03 +00:00
Andres Morales
38e6e4ef98 Merge "reset lockout deadline on device reboot" into mnc-dr-dev 2015-09-16 16:04:56 +00:00
Zach Jang
ea196888a0 am e1ab0999: am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit 'e1ab0999cdcb719480200ea6be71a60f58ce90f4':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 02:32:04 +00:00
Zach Jang
d00737fc72 am eee9c2de: am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit 'eee9c2de434f89764b66dbe9dc7c8169971e5228':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 02:31:58 +00:00
Zach Jang
e1ab0999cd am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '2b564bf42a68370dc4d32acbb597cfb7c45f9f4f':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 02:25:32 +00:00
Zach Jang
eee9c2de43 am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '0098cbc011771d5ffdf93a3a4b7e6a0507e1725d':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 02:25:28 +00:00
Zach Jang
2b564bf42a am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '716c6269674474867dc4720f86f739c639c83400':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 02:16:04 +00:00
Zach Jang
0098cbc011 am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '971ff47c75889a2fc4ac710fbe62ba819feeaba6':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 02:16:00 +00:00
Zach Jang
716c626967 am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '63348ae4572cd9394e79fe343d2fca2b38498d1c':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 02:06:31 +00:00
Zach Jang
971ff47c75 am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '1b06455e44395489dcd027a170e68eabf2ebe1da':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 02:06:26 +00:00