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
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
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
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
Fyodor Kupolov
c3067882db
Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
2015-07-30 20:50:03 +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
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
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
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
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
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
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
Geoff Mendal
85a330be74
am bca7e3d1
: (-s ours) am cfb389e8
: (-s ours) am 597d75ea
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bca7e3d192dd490ffe6a9aa779213d5e7d105814':
Import translations. DO NOT MERGE
2015-07-30 13:11:40 +00:00
Geoff Mendal
bca7e3d192
am cfb389e8
: (-s ours) am 597d75ea
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cfb389e8c1bd0b9f35768a6272524b4611aba8ad':
Import translations. DO NOT MERGE
2015-07-30 12:58:45 +00:00
Geoff Mendal
cfb389e8c1
am 597d75ea
: (-s ours) Import translations. DO NOT MERGE
...
* commit '597d75eaad03047d0f55c49ce9c0d788f5a72a72':
Import translations. DO NOT MERGE
2015-07-30 12:46:45 +00:00
Geoff Mendal
597d75eaad
Import translations. DO NOT MERGE
...
Change-Id: I7da1ba23b887e9ad682d65e57cc42d7a63c2caef
Auto-generated-cl: translation import
2015-07-30 05:35:46 -07:00
Geoff Mendal
37ab706201
am de5d7ea9
: (-s ours) am f273d917
: (-s ours) am 53f771d8
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'de5d7ea9d2fd2334e67fc1bb7efd3348c2c5388d':
Import translations. DO NOT MERGE
2015-07-29 23:22:31 +00:00
Geoff Mendal
de5d7ea9d2
am f273d917
: (-s ours) am 53f771d8
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f273d91741d382b66ecdba231b44a89688ae02d2':
Import translations. DO NOT MERGE
2015-07-29 23:02:07 +00:00
Geoff Mendal
f273d91741
am 53f771d8
: (-s ours) Import translations. DO NOT MERGE
...
* commit '53f771d8218c553248d0954fba2f25b4257838b2':
Import translations. DO NOT MERGE
2015-07-29 22:50:48 +00:00
Jorim Jaggi
18dea40e2d
am 1b730cb7
: am 434d55e5
: am 23ace013
: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '1b730cb77eb44e9e6938e11fe19522dcd909ec2f':
Adjustments for find sensor screen
2015-07-29 22:39:34 +00:00
Geoff Mendal
53f771d821
Import translations. DO NOT MERGE
...
Change-Id: I959a8c52fd330769880fd9b41894e404865a951e
Auto-generated-cl: translation import
2015-07-29 15:31:28 -07:00
Jorim Jaggi
1b730cb77e
am 434d55e5
: am 23ace013
: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '434d55e591bfb7cc84fed8d8574624425348a711':
Adjustments for find sensor screen
2015-07-29 22:26:16 +00:00
Jorim Jaggi
434d55e591
am 23ace013
: Merge "Adjustments for find sensor screen" into mnc-dev
...
* commit '23ace01340906e9615f747b0adeaac4bf7bf1dc2':
Adjustments for find sensor screen
2015-07-29 22:14:09 +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
Jorim Jaggi
23ace01340
Merge "Adjustments for find sensor screen" into mnc-dev
2015-07-29 21:58:43 +00:00
Sanket Padawe
86d853000f
am 19336da3
: am ac2347c0
: am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '19336da3f729fcde00782ae60124b1219bd4bf2b':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 20:03:32 +00:00
Sanket Padawe
19336da3f7
am ac2347c0
: am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'ac2347c0bf3c2b9c2ff7d8e2abe0a38d861495c4':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 19:49:53 +00:00
Sanket Padawe
ac2347c0bf
am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 19:25:06 +00:00
Maurice Lam
4921339acc
am 0ce45dbb
: am 1df9a7cc
: am 3760e5e7
: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit '0ce45dbbe74c45f89098cde7239c257e3cf87d5d':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 19:13:30 +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
1df9a7cc16
am 3760e5e7
: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit '3760e5e7e4ae17012cf0f336fa0d8d62ecbf5e69':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 18:39:00 +00:00
Julia Reynolds
61bc6b729b
am 24a1ac36
: am c2f62f65
: am 00b5488c
: Merge "Change assist app warning message text" into mnc-dev
...
* commit '24a1ac3620f8fd983f42d38d24a32b13f74b8cda':
Change assist app warning message text
2015-07-29 18:30:46 +00:00
Julia Reynolds
a578d3afe8
am 6785be73
: am 089e9e9a
: am ae422fd0
: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
...
* commit '6785be7362a158926e36f0bfe3f721082c9be3f3':
Change 'data' label to 'data usage'.
2015-07-29 18:30:45 +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
Julia Reynolds
24a1ac3620
am c2f62f65
: am 00b5488c
: Merge "Change assist app warning message text" into mnc-dev
...
* commit 'c2f62f650a16aead5f6806ca2ac7ae400775c935':
Change assist app warning message text
2015-07-29 18:03:57 +00:00