Maurice Lam
0074510a57
am 997bcaa7
: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '997bcaa7d8486814540d8bcf1269918d8c48d960':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 00:49:57 +00:00
Maurice Lam
09840984e3
am 997bcaa7
: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '997bcaa7d8486814540d8bcf1269918d8c48d960':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 00:48:43 +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
Geoff Mendal
c48a8be0fe
am 0540c147
: (-s ours) am 109ba8ed
: (-s ours) am dc3e92c2
: (-s ours) am d5974497
: (-s ours) am 6b0a2d21
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0540c147c91fe4f2cd3da6c721878c5e426a3239':
Import translations. DO NOT MERGE
2015-07-30 23:35:40 +00: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
Geoff Mendal
0540c147c9
am 109ba8ed
: (-s ours) am dc3e92c2
: (-s ours) am d5974497
: (-s ours) am 6b0a2d21
: (-s ours) Import translations. DO NOT MERGE
...
* commit '109ba8ed33d25102af265c76b339803a25da0456':
Import translations. DO NOT MERGE
2015-07-30 23:28:47 +00:00
Geoff Mendal
109ba8ed33
am dc3e92c2
: (-s ours) am d5974497
: (-s ours) am 6b0a2d21
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dc3e92c24de06d49a1e62aa73ff1269966efb026':
Import translations. DO NOT MERGE
2015-07-30 23:20:35 +00:00
Geoff Mendal
dc3e92c24d
am d5974497
: (-s ours) am 6b0a2d21
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd5974497caa856fbeb18e482ca0b427873327356':
Import translations. DO NOT MERGE
2015-07-30 23:16:06 +00:00
Geoff Mendal
197cfdbd2c
am 6b0a2d21
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6b0a2d21e65ab1c29aec925380bbf43bab22c2c1':
Import translations. DO NOT MERGE
2015-07-30 23:10:55 +00:00
Geoff Mendal
d5974497ca
am 6b0a2d21
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6b0a2d21e65ab1c29aec925380bbf43bab22c2c1':
Import translations. DO NOT MERGE
2015-07-30 23:10:36 +00:00
Geoff Mendal
6b0a2d21e6
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22672924
Change-Id: I99789b790e682308514351a13025b9625ec085e1
2015-07-30 15:54:40 -07:00
Fyodor Kupolov
c994eec8fe
am 1b8b5ff0
: am 3a3f495e
: am 23d4ebdc
: am 74f8cb9c
: am c3067882
: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
...
* commit '1b8b5ff01bb0ceab7b6d998baceb03dfcc890431':
Added android.permission.PEERS_MAC_ADDRESS permission
2015-07-30 21:41:00 +00:00
Fyodor Kupolov
1b8b5ff01b
am 3a3f495e
: am 23d4ebdc
: am 74f8cb9c
: am c3067882
: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
...
* commit '3a3f495e2480235a83fdd9c7efe6810f003504bc':
Added android.permission.PEERS_MAC_ADDRESS permission
2015-07-30 21:21:14 +00:00
Fyodor Kupolov
3a3f495e24
am 23d4ebdc
: am 74f8cb9c
: am c3067882
: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
...
* commit '23d4ebdcccb6a8d030a744b4ae85907b65edc6f3':
Added android.permission.PEERS_MAC_ADDRESS permission
2015-07-30 21:09:09 +00:00
Fyodor Kupolov
23d4ebdccc
am 74f8cb9c
: am c3067882
: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
...
* commit '74f8cb9c9bf2c354a17ce155977dc9d8bead000a':
Added android.permission.PEERS_MAC_ADDRESS permission
2015-07-30 21:01:20 +00:00
Fyodor Kupolov
b3fd5e172b
am c3067882
: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
...
* commit 'c3067882dbf00e424cd146181cf15f33ecb9f8f8':
Added android.permission.PEERS_MAC_ADDRESS permission
2015-07-30 20:54:23 +00:00
Fyodor Kupolov
74f8cb9c9b
am c3067882
: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
...
* commit 'c3067882dbf00e424cd146181cf15f33ecb9f8f8':
Added android.permission.PEERS_MAC_ADDRESS permission
2015-07-30 20:54:10 +00: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
Fyodor Kupolov
c3067882db
Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
2015-07-30 20:50:03 +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
Jorim Jaggi
02a2be35c7
am d9eae869
: am 80d5c931
: am 92f9bdc6
: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit 'd9eae869751a245df367e812010b84d13d2bf3e0':
Add dialog to confirm last fingerprint removal
2015-07-30 20:37:34 +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
93eff27e2a
am 92f9bdc6
: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit '92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3':
Add dialog to confirm last fingerprint removal
2015-07-30 20:22:21 +00:00
Jorim Jaggi
80d5c9313d
am 92f9bdc6
: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
...
* commit '92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3':
Add dialog to confirm last fingerprint removal
2015-07-30 20:22:14 +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
Jeff Sharkey
600cfe2f67
am a61c803e
: am 7f3026c3
: am bb9d6b90
: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
...
* commit 'a61c803ed3c9f815a35f53ebccb6b9e7cc6d86b2':
Refresh after clearing, tweak warn threshold.
2015-07-30 19:47:44 +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
7f3026c3ca
am bb9d6b90
: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
...
* commit 'bb9d6b906e564c9f685834bb7dcccfbe0aa87a29':
Refresh after clearing, tweak warn threshold.
2015-07-30 19:32:36 +00:00
Jeff Sharkey
43c41edfc7
am bb9d6b90
: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
...
* commit 'bb9d6b906e564c9f685834bb7dcccfbe0aa87a29':
Refresh after clearing, tweak warn threshold.
2015-07-30 19:31:34 +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
bb75ef0aa6
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 '82e6edfe1bad73b6757aa93725e74fb7f69a26a4':
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:39:21 +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
62d04c0012
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 'eb372c93ee00fa9365206129136501497e6341c7':
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:22:37 +00:00
Jason Monk
2ff120a33f
am 19128bd1
: Extend char limit by small amount
...
* commit '19128bd1679cfcad3e38a447dd4584fa5280920f':
Extend char limit by small amount
2015-07-30 17:22:06 +00:00
Billy Lau
95026e0328
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 'eb372c93ee00fa9365206129136501497e6341c7':
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:22:04 +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
Jason Monk
92ec7b4e23
am d7c4c89f
: am e05b10fd
: am e520015e
: am bebcdd0c
: am 19128bd1
: Extend char limit by small amount
...
* commit 'd7c4c89f5efb39ce8bf9f2f38ff2b7905508b3f2':
Extend char limit by small amount
2015-07-30 16:59:56 +00:00
Jason Monk
d7c4c89f5e
am e05b10fd
: am e520015e
: am bebcdd0c
: am 19128bd1
: Extend char limit by small amount
...
* commit 'e05b10fdb2c09ca786195a125b8aa64189596c9e':
Extend char limit by small amount
2015-07-30 16:52:12 +00:00
Jason Monk
e05b10fdb2
am e520015e
: am bebcdd0c
: am 19128bd1
: Extend char limit by small amount
...
* commit 'e520015efa55b02938c8f1bafb5e45313c057dd1':
Extend char limit by small amount
2015-07-30 15:54:36 +00:00
Jason Monk
e520015efa
am bebcdd0c
: am 19128bd1
: Extend char limit by small amount
...
* commit 'bebcdd0cb0405c03a72fe55bc4b198877a4f1516':
Extend char limit by small amount
2015-07-30 15:39:44 +00:00
Jason Monk
bebcdd0cb0
am 19128bd1
: Extend char limit by small amount
...
* commit '19128bd1679cfcad3e38a447dd4584fa5280920f':
Extend char limit by small amount
2015-07-30 15:22:41 +00:00
Jason Monk
19128bd167
Extend char limit by small amount
...
Bug: 22822007
Bug: 22687961
Change-Id: I9a1528dc7175cfd530900e51d2210224ff07ab23
2015-07-30 11:05:09 -04:00