Jim Miller
efaa19d97d
Fix fingerprint enrolling bug.
...
This fixes a bug where rotating the device would call post_enroll()
too early, thus invalidating the current session.
Fixes bug 22708390
Change-Id: Ib4a334b50c16630b4fe4b451f6019d41225b2011
2015-07-31 23:17:24 +00:00
Maurice Lam
88832a3d4d
Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
2015-07-31 18:50:39 +00:00
Maurice Lam
0ae9cfcff8
am 824bcec9: am 0d1f08cb: am e2d4c5e8: am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '824bcec98d86a406bb90ca031e359d392f9f6ba9':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 01:15:16 +00:00
Maurice Lam
824bcec98d
am 0d1f08cb: am e2d4c5e8: am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '0d1f08cb79b0de41a8c1c13332e2a01ed409e2a2':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 01:09:13 +00:00
Maurice Lam
e2d4c5e8cc
am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '09840984e317c12d3ead3b1d16c65844f363e8c5':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 00:55:16 +00:00
Maurice Lam
997bcaa7d8
Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
2015-07-31 00:43:58 +00:00
Maurice Lam
5656314aca
[Fingerprint] Advertise wake & unlock during SUW
...
Adds a string to advertise to the user that wake & unlock is
available on all fingerprint devices.
Bug: 22644642
Change-Id: I9e44174c6ab088a06f95ae5c377c8ccec13a4257
2015-07-30 17:02:26 -07:00
Nick Kralevich
8a9b03f746
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
...
In ec323a0849 , DISALLOW_USB_FILE_TRANSFER
turned off all USB options except for "Charge Only". This is too
aggressive. MIDI should be available when DISALLOW_USB_FILE_TRANSFER
is set.
Remove mUsbManager.isUsbDataUnlocked(). That data is available
by accessing the sticky broadcast.
Bug: 22447614
Bug: 21429947
Change-Id: Icd8398c4cf43f807acf77923b0b25c18f9a9b0d0
2015-07-30 16:34:01 -07:00
Jorim Jaggi
2181b3d310
am ba3c4ba2: am 02a2be35: am d9eae869: am 80d5c931: am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit 'ba3c4ba235a1f13e804faed7911c3033997d4ad2':
Add dialog to confirm last fingerprint removal
2015-07-30 20:50:04 +00:00
Jorim Jaggi
ba3c4ba235
am 02a2be35: am d9eae869: am 80d5c931: am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit '02a2be35c7dd71690693a35fb99340dc124d9a3a':
Add dialog to confirm last fingerprint removal
2015-07-30 20:44:08 +00:00
Maurice Lam
c3b48c349d
[Fingerprint] Disable back in setup enrolling screen
...
Disable the back button because the back stack behavior is confusing.
Instead of going back to the screen the user previously saw, pressing
back in enrolling screen goes back to FindSensor.
Bug: 22848016
Change-Id: I71852eb1974f1542fb519bf8bbfdce12de62e66b
2015-07-30 13:30:32 -07:00
Jorim Jaggi
d9eae86975
am 80d5c931: am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit '80d5c9313d48a49d5216ab3a65ac88e1cb3b9c18':
Add dialog to confirm last fingerprint removal
2015-07-30 20:28:59 +00:00
Jorim Jaggi
92f9bdc6ec
Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
2015-07-30 20:16:08 +00:00
Jeff Sharkey
c9a811619b
am 31566703: am 600cfe2f: am a61c803e: am 7f3026c3: am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
...
* commit '3156670323c2c909a05215c464181db44abbe991':
Refresh after clearing, tweak warn threshold.
2015-07-30 19:59:20 +00:00
Jeff Sharkey
3156670323
am 600cfe2f: am a61c803e: am 7f3026c3: am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
...
* commit '600cfe2f67b8272be53a20dc1fb5690050b515d9':
Refresh after clearing, tweak warn threshold.
2015-07-30 19:53:58 +00:00
Jorim Jaggi
12ee807c1f
Add dialog to confirm last fingerprint removal
...
Bug: 22847296
Change-Id: Ib4984d8db0c9abc00442026360bd5617515225aa
2015-07-30 12:42:08 -07:00
Jeff Sharkey
a61c803ed3
am 7f3026c3: am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
...
* commit '7f3026c3ca5f8e265da0904f81d899408527c142':
Refresh after clearing, tweak warn threshold.
2015-07-30 19:38:48 +00:00
Jeff Sharkey
bb9d6b906e
Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
2015-07-30 19:24:53 +00:00
Jeff Sharkey
f99b424f3b
Refresh after clearing, tweak warn threshold.
...
Refresh UI after clearing cache. Hide user header on single-user
devices to match UX spec. Refine adopted storage warning threshold
based on experiments with various devices.
For example, a typical internal storage device runs the benchmark
in about 600ms. Very fast SD cards take about 1700ms, moderate speed
SD cards take about 3800ms, and slow SD cards take about 6800ms.
Bug: 22345902, 22487370
Change-Id: I6066f3b78dbb32277ae94b79e325500724f83c7e
2015-07-30 11:51:47 -07:00
Billy Lau
482e570683
am 9ccf08d2: am bb75ef0a: am 82e6edfe: am 95026e03: am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev
...
* commit '9ccf08d2ee47407273bd9bc16f0fe0aea3b278c4':
Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one
2015-07-30 17:55:33 +00:00
Billy Lau
9ccf08d2ee
am bb75ef0a: am 82e6edfe: am 95026e03: am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev
...
* commit 'bb75ef0aa60216ed7c77b7f9f83ceaee577a6e34':
Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one
2015-07-30 17:47:30 +00:00
Billy Lau
82e6edfe1b
am 95026e03: am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev
...
* commit '95026e032809f39fb2aece05e8b3d8f74eca77ea':
Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one
2015-07-30 17:30:01 +00:00
Billy Lau
eb372c93ee
Merge "Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one" into mnc-dev
2015-07-30 17:14:17 +00:00
Billy Lau
fee785645b
Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's
...
page instead of the top level one
Settings:
Added two activities to handle app-specific Intent when app invoke permission
management UI.
SettingsActivity:
Added two fragment classes to handle app-specific Intent when app invoke permission
management UI.
AndroidManifest.xml:
We handle both Intent to top level settings and app-specific management UI for
app ops protected permissions.
AppStateAppOpsBridge:
Added a new field to PermissionState to keep track of permission declared vs one
that is actually granted during install time.
AppState{Overlay/Usage/WriteSettings}Bridge:
Updated the fields affected by changes in PermissionState.
{DrawOverlay/UsageAccess/WriteSettings}Details:
Disabled the toggling of permission if the app did not declare for the asked
permission.
Change-Id: Ibf63e4d9a4fbf7899a93d2176abb1204c4f75557
2015-07-29 23:04:57 +01:00
Fyodor Kupolov
eac01dc739
am cae9e899: am 2731a18f: Merge "brightness status not refresh in powercontrol widget"
...
* commit 'cae9e8999c27e21518db84ac94860f5958046c69':
brightness status not refresh in powercontrol widget
2015-07-29 22:04:16 +00:00
Maurice Lam
e863016bac
am e27b5590: am 4921339a: am 0ce45dbb: am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit 'e27b5590986c378ae225d91ec258a85f4428f00b':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 22:03:37 +00:00
Fyodor Kupolov
cae9e8999c
am 2731a18f: Merge "brightness status not refresh in powercontrol widget"
...
* commit '2731a18fbe26eed89d870bf70a116a3588d227e1':
brightness status not refresh in powercontrol widget
2015-07-29 20:02:25 +00:00
Maurice Lam
e27b559098
am 4921339a: am 0ce45dbb: am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit '4921339acc0a670ba9fdefe612667db9f8d50bc6':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 19:35:53 +00:00
Maurice Lam
0ce45dbbe7
am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit '1df9a7cc16a9dd9892b633aad4ec246677d2c6b5':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 18:53:41 +00:00
Maurice Lam
3760e5e7e4
Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
2015-07-29 18:25:48 +00:00
Chris Wren
aa352b39ca
am 96117fc7: am 97ad12db: am 59f07cc7: am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
...
* commit '96117fc751d45f8ab307512821c9a19ee48249f6':
fix InactiveApps instrumentation
2015-07-29 17:31:01 +00:00
Chris Wren
96117fc751
am 97ad12db: am 59f07cc7: am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
...
* commit '97ad12db5c36792870888b5d4a0f0c8d35bf059b':
fix InactiveApps instrumentation
2015-07-29 17:08:51 +00:00
Chris Wren
59f07cc7c8
am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
...
* commit 'cb176a41ad0ac94a65ed13bf1e18242f8220bd5b':
fix InactiveApps instrumentation
2015-07-29 16:26:32 +00:00
Chris Wren
2a56d7f23b
Merge "fix InactiveApps instrumentation" into mnc-dev
2015-07-29 14:57:14 +00:00
Julia Reynolds
b2b58dac7b
am 56cdfbf6: am 3d6a40af: am 1990f8f7: am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
...
* commit '56cdfbf6286fef9b0d88e5c4dd6f20292582ed04':
Use pattern visibility setting on confirm pattern screen.
2015-07-29 13:55:10 +00:00
Julia Reynolds
56cdfbf628
am 3d6a40af: am 1990f8f7: am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
...
* commit '3d6a40af6e8adb8230812a84998fadf82d71048f':
Use pattern visibility setting on confirm pattern screen.
2015-07-29 13:34:43 +00:00
Julia Reynolds
1990f8f722
am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
...
* commit 'cb91edaeb2fd9bdf8a77a994c4767fac808bbe36':
Use pattern visibility setting on confirm pattern screen.
2015-07-29 13:00:27 +00:00
Julia Reynolds
300d6fd90c
Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
2015-07-29 12:25:54 +00:00
Martijn Coenen
f299787f32
am 25f86b0f: am 120ed352: am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
...
* commit '25f86b0fafc1c9d656ce8aab305137c41662b037':
Fix tap & pay strings.
2015-07-29 11:04:34 +00:00
Martijn Coenen
25f86b0faf
am 120ed352: am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
...
* commit '120ed352430ae322fa9a5cc79f2c7bf654e2156a':
Fix tap & pay strings.
2015-07-29 10:46:42 +00:00
Martijn Coenen
b0390ed0e5
am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
...
* commit 'de661d5b15e6d645229be4ea582a7d01fe160b9c':
Fix tap & pay strings.
2015-07-29 10:06:07 +00:00
Martijn Coenen
8e7b9cf9f6
Merge "Fix tap & pay strings." into mnc-dev
2015-07-29 07:54:04 +00:00
Zach Johnson
9153a338b7
am b9739da6: am 0f5373e0: am b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
...
* commit 'b9739da6d0929d41a6490e99dbeb7abfc1ddaf43':
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-29 00:17:17 +00:00
Zach Johnson
b9739da6d0
am 0f5373e0: am b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
...
* commit '0f5373e0eb2a912407323aaa459a3c55d3037115':
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-28 23:56:29 +00:00
Zach Johnson
b5c146eef9
am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
...
* commit 'ecb19d540025a6c1855d148f1b4015f3a107bfd1':
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-28 23:18:57 +00:00
Zach Johnson
a425e86478
Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
2015-07-28 22:36:31 +00:00
Julia Reynolds
5f4278bdd9
am b5852c60: am 981ff182: am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
...
* commit 'b5852c60610014b31a52792762ef120a68468775':
Prevent crash in app memory updater.
2015-07-28 22:05:06 +00:00
Julia Reynolds
639ff84f94
am 3275d302: am 13a07054: am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
...
* commit '3275d30212196f8d42afb6d455508e345bf544e5':
Hide usage graph on app usage details pages.
2015-07-28 22:05:03 +00:00
Julia Reynolds
b5852c6061
am 981ff182: am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
...
* commit '981ff1825e74dd391f4b7cdf03032cfbab0d7100':
Prevent crash in app memory updater.
2015-07-28 21:53:01 +00:00
Julia Reynolds
3275d30212
am 13a07054: am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
...
* commit '13a070549d7a38e6b892293eb1ec4f6e52eff2cc':
Hide usage graph on app usage details pages.
2015-07-28 21:53:00 +00:00