Commit Graph

2602 Commits

Author SHA1 Message Date
Dianne Hackborn
5922ee6744 am e6abedd6: Merge "Account for all wake lock usage."
* commit 'e6abedd6b88b14101a00877be1255c1094b76e55':
  Account for all wake lock usage.
2011-10-04 11:54:19 -07:00
Dianne Hackborn
c174ec64f9 Account for all wake lock usage.
Wake locks can be held outside of what we measure in battery stats,
by things not going through the power manager.  Account for this by
computing the total wake time that is not covered by known wake locks
and screen on time, and blame this on Android OS.

Change-Id: Idf2907bc35f8c35f92155671c8dba521ae9ea804
2011-10-03 18:37:44 -07:00
Danielle Millett
6e59662742 am dd98ff19: Merge "Reorganized the biometric weak check functions"
* commit 'dd98ff192cb0170927f58645591ac2d54d34cc65':
  Reorganized the biometric weak check functions
2011-10-03 17:39:53 -07:00
Danielle Millett
0fb158a685 Reorganized the biometric weak check functions
Moved isBiometricSensorAvailable functionality into
isBiometricWeakInstalled (formerly called isBiometricEnabled).  Settings
now only shows biometric weak if it's installed, if it's not installed
and the lock type is currently set to biometric weak, the backup lock
is shown as being set instead.

Change-Id: Icfe326a6598df33ee60d5fdc024273d94f115983
2011-09-30 17:47:45 -04:00
Steven Ross
5a1d25f8bb am 31dac17c: Delete the temp gallery on return from fallback
* commit '31dac17c4b0b49b4968b42b2af6f0799a0508a2f':
  Delete the temp gallery on return from fallback
2011-09-30 13:10:03 -07:00
Steven Ross
31dac17c4b Delete the temp gallery on return from fallback
Change-Id: Id501302aa8c5606006f3e403e51bb01981bc173e
2011-09-30 15:51:57 -04:00
Steven Ross
58ef35209a am c5df3daa: Merge "calling back SetupFaceLock to clean up temporary gallery"
* commit 'c5df3daa0231c0b057497acc4527ead2fc979999':
  calling back SetupFaceLock to clean up temporary gallery
2011-09-30 11:11:33 -07:00
Steven Ross
c5df3daa02 Merge "calling back SetupFaceLock to clean up temporary gallery" 2011-09-30 11:08:58 -07:00
Amith Yamasani
109c2ace97 am b40e4491: Merge "Remove "Screen lock" category header as the title is sufficient."
* commit 'b40e4491efe99c1499d6af3a31a140ed99cf3560':
  Remove "Screen lock" category header as the title is sufficient.
2011-09-29 16:44:39 -07:00
Amith Yamasani
b40e4491ef Merge "Remove "Screen lock" category header as the title is sufficient." 2011-09-29 16:43:34 -07:00
Romain Guy
2623d685f3 am c00a9d9f: Merge "Add developer setting to force hardware acceleration"
* commit 'c00a9d9f5e0719601f670207f57d50225365f2cb':
  Add developer setting to force hardware acceleration
2011-09-29 16:43:01 -07:00
Romain Guy
0c9c14b786 Add developer setting to force hardware acceleration
Change-Id: I1bb3da7db4602ce7cbdfb46799c5114ce63ffed2
2011-09-29 16:39:31 -07:00
Amith Yamasani
cf26bb2dcc Remove "Screen lock" category header as the title is sufficient.
Bug: 5203189

Insert a descriptive text as a header view when in weak biometric
fallback case.

Change-Id: Ic10cc7d276975b13c188bd15016fea2200ec0e5b
2011-09-29 15:19:07 -07:00
Steven Ross
c620ba41ce calling back SetupFaceLock to clean up temporary gallery
This is done when the backup lock is complete or canceled.
If successful, the permanent gallery is replaced with the new one.
The temporary gallery is always deleted

Also deletes the main gallery if the lock type is changed from facial recognition

Change-Id: Id7b066fd852c7ba188d6e46b47391a362cbab40f
2011-09-29 16:01:13 -04:00
Gilles Debunne
aa05d60cae am 62061e14: Merge "Bug 5353255: use a switch to toggle accounts & sync"
* commit '62061e14fb7eced16e43d879518ec72b696197ab':
  Bug 5353255: use a switch to toggle accounts & sync
2011-09-29 10:23:45 -07:00
Gilles Debunne
62061e14fb Merge "Bug 5353255: use a switch to toggle accounts & sync" 2011-09-29 10:21:08 -07:00
Gilles Debunne
13b7d8aa45 Bug 5353255: use a switch to toggle accounts & sync
Change-Id: I00821ba63651d713a148021f64bb95e7f69e6b88
2011-09-28 15:15:30 -07:00
satok
87c176bdd4 am 8fe98699: Fix the behavior of preference in IME Settings
* commit '8fe9869955f4c85ccc2f3cb11dfbfdb253318ea1':
  Fix the behavior of preference in IME Settings
2011-09-27 20:36:28 -07:00
satok
8fe9869955 Fix the behavior of preference in IME Settings
Change-Id: I41f7c36fb73730248dcc98abbf4276ef6d772f36
2011-09-28 12:01:40 +09:00
Amith Yamasani
8476fc08d5 am 0554ddb3: Merge "Show in Settings->About if the device is an engineering sample."
* commit '0554ddb39a5bdbbcf88bdf31094b37ead5d95032':
  Show in Settings->About if the device is an engineering sample.
2011-09-27 19:32:41 -07:00
Amith Yamasani
2397a7391e Show in Settings->About if the device is an engineering sample.
Don't show anything additional for a production device.

Bug: 5380778
Change-Id: I82532c37b0fc71fe5ada91a7b945b3becffbc535
2011-09-27 18:06:33 -07:00
Amith Yamasani
125f4b8d67 am df5ab21d: am ae69755a: Disable USB connection type when monkeys are running.
* commit 'df5ab21d21fac3107fed231d4469e5bc26a089f6':
  Disable USB connection type when monkeys are running.
2011-09-27 13:12:55 -07:00
Amith Yamasani
df5ab21d21 am ae69755a: Disable USB connection type when monkeys are running.
* commit 'ae69755aa874dbac77e9874d9716ab891a144193':
  Disable USB connection type when monkeys are running.
2011-09-27 13:10:47 -07:00
Amith Yamasani
ae69755aa8 Disable USB connection type when monkeys are running.
Bug: 5375336

Also use the correct API for testing if monkeys are running.
(ActivityManager.isUserAMonkey())

Bug: 5375910
Change-Id: I2bf8e061ee5977d521de197d3a92095c1a98218d
2011-09-27 11:33:17 -07:00
Danielle Millett
5e83b2faeb am cc571cc4: Merge "Changed header to specify backup lock"
* commit 'cc571cc4fe626517482435a8ffd3bd461bf4bbbd':
  Changed header to specify backup lock
2011-09-27 07:27:24 -07:00
Danielle Millett
cc571cc4fe Merge "Changed header to specify backup lock" 2011-09-27 06:14:01 -07:00
satok
01c2387bae am 44e32ab4: Merge "Tweak IME settings"
* commit '44e32ab40fa1421a564801d2bfba0407575d7e37':
  Tweak IME settings
2011-09-27 00:12:16 -07:00
satok
44e32ab40f Merge "Tweak IME settings" 2011-09-27 00:10:57 -07:00
satok
054fc44cae Tweak IME settings
Change-Id: I13b044abdcb1215306ecfd5070d6e1a16e2d92d7
2011-09-27 16:08:46 +09:00
Jeff Sharkey
28a345ac84 am dc2c5ae2: Merge "Data usage strings, sweep touches, fixes."
* commit 'dc2c5ae2b0b123df1c2256672be9e2ec8bde248b':
  Data usage strings, sweep touches, fixes.
2011-09-26 19:16:57 -07:00
Jeff Sharkey
dc2c5ae2b0 Merge "Data usage strings, sweep touches, fixes." 2011-09-26 15:31:57 -07:00
Danielle Millett
940407eb6a Changed header to specify backup lock
-Changed main header to show backup lock text
-Reworded normal header
-Changed instances of FacePass to FaceLock

Change-Id: I66cbd3ada87df30b6b7ceb1a784d365ba60a8f41
2011-09-26 18:06:37 -04:00
Kenny Root
2ee896a519 am 3f1fb4f1: Merge "Make verifier device id information visible"
* commit '3f1fb4f1549c3ff32cd85e85bbe13765a02d6960':
  Make verifier device id information visible
2011-09-26 14:39:26 -07:00
Kenny Root
3f1fb4f154 Merge "Make verifier device id information visible" 2011-09-26 14:38:10 -07:00
Amith Yamasani
a33f4dcd40 am f07e46fa: Merge "Fixes to parent fragment names and other manifest issues."
* commit 'f07e46fae87014fd21226428d22f5182b1f603cb':
  Fixes to parent fragment names and other manifest issues.
2011-09-26 11:53:19 -07:00
Amith Yamasani
f07e46fae8 Merge "Fixes to parent fragment names and other manifest issues." 2011-09-26 11:51:39 -07:00
Kenny Root
498fbe470e Make verifier device id information visible
This makes the verifier device identifier information for this
particular device visible in the "Development" screen of
Settings.

Bug: 5205163
Change-Id: I55e0b32fe98f898e6e8d723ce6696529fdccffd0
2011-09-26 09:55:03 -07:00
Jeff Sharkey
461842a8c0 Data usage strings, sweep touches, fixes.
Change strings around limiting background data.  Move limit/warning
sweeps above inspection sweeps, and teach about additional neighbors
on different axis.

Guard against DialogFragment.show(), fix pie chart to draw edges, and
remove data usage from battery UI.

Bug: 5341374, 5337650, 5337385, 5319465, 5236335
Change-Id: Iea8c2a2ab405b645d85abe34a0178d4b8874cdd5
2011-09-25 18:41:13 -07:00
Wink Saville
1ec34bfedd am bde64e3d: am 426fc66a: Add persist.radio.ramdump.
* commit 'bde64e3d93b0144cd8b7c0ff65103ffb63fddba7':
  Add persist.radio.ramdump.
2011-09-25 15:27:11 -07:00
Wink Saville
bde64e3d93 am 426fc66a: Add persist.radio.ramdump.
* commit '426fc66a8a9371e34d936d18d5b254fd002b4c11':
  Add persist.radio.ramdump.
2011-09-25 15:25:39 -07:00
Amith Yamasani
990fb52ef7 Fixes to parent fragment names and other manifest issues.
Bug: 5324865

Also, when jumping into a second+ level setting, make sure the header list
item is scrolled into view.

Change-Id: I714c1f80c8b20e23208763f1c30449a49f2a4082
2011-09-25 14:49:49 -07:00
Wink Saville
426fc66a8a Add persist.radio.ramdump.
A little refactoring to keep most everything for these "temporary"
flags in one place.

Bug: 5348373
Change-Id: I257aac616ae635e6f9d9dffd692357b4c08037e2
2011-09-25 14:39:02 -07:00
Svetoslav Ganov
98e473e8c3 am 22348cee: Merge "Settings may show enabled accessiiblity services after restore even if accessibility is off."
* commit '22348cee27890e7e9a70ab6afe247cd966198761':
  Settings may show enabled accessiiblity services after restore even if accessibility is off.
2011-09-23 16:59:38 -07:00
Svetoslav Ganov
cb0a7a82a6 Settings may show enabled accessiiblity services after restore even if accessibility is off.
Now the state of accessibility is determined from the number of running, i.e. enabled and
installed, accessibility services - more than zero access is on else it is off. After a
restore the device may have some enabled and installed services but disabled accessibility
setting. In such case settings should respect the restored values and the services should
be displayed as disabled initially and then enabling one of them will enable accessibility.

bug:5367404

Change-Id: If3756aba3f59e282000247e99f87ebff2b64c9fd
2011-09-23 16:47:41 -07:00
Wink Saville
310b39fffa am 9fe945b8: am fbea38fd: Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
* commit '9fe945b854f92314ad387705ad20a129e46c317a':
  Add a button to enable/disable Mobile Terminated SMS over IMS
2011-09-22 23:42:46 -07:00
Wink Saville
9fe945b854 am fbea38fd: Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
* commit 'fbea38fd2b458b59b0f2a7affa158b486cdc1df5':
  Add a button to enable/disable Mobile Terminated SMS over IMS
2011-09-22 23:39:35 -07:00
Amith Yamasani
2e56b15ae7 am 16a9b14f: Merge "Don\'t append list of accounts every time we return to this screen."
* commit '16a9b14fa748c742c62f621586244303da4f4d8e':
  Don't append list of accounts every time we return to this screen.
2011-09-22 17:05:41 -07:00
Wink Saville
fbea38fd2b Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom 2011-09-22 15:29:19 -07:00
Wink Saville
382a75b105 Add a button to enable/disable Mobile Terminated SMS over IMS
This toggles persist.radio.imsallowmtsms between 0/1 which can
be used during testing and bring up of SMS over IMS.

Change-Id: I4581bca76899445e825260e8af6a39903d029c44
2011-09-22 15:17:00 -07:00
Amith Yamasani
3f45de559f Don't append list of accounts every time we return to this screen.
Bug: 5355920

Remove the contents of the layout before adding the accounts.

Change-Id: Ic9256140f892968b2388f47d982eaada720df892
2011-09-22 14:34:17 -07:00