OSDN Git Service
Vinit Deshpande [Sat, 1 Aug 2015 00:35:02 +0000 (00:35 +0000)]
am
b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '
b74c0b2a27f4d30628fe4482a9de6387c6dbdaca':
wifi: Check for the sizeof ssid to start SoftAP
Vinit Deshpande [Sat, 1 Aug 2015 00:26:01 +0000 (00:26 +0000)]
Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
Sunil Dutt [Thu, 2 Jul 2015 09:58:58 +0000 (15:28 +0530)]
wifi: Check for the sizeof ssid to start SoftAP
Disable the option to start SoftAP if ssid byte length is over 32 bytes.
Bug:
22074821
Change-Id: I696dca1aac8673bff168481fde4b013450bac72c
Jim Miller [Fri, 31 Jul 2015 23:48:15 +0000 (23:48 +0000)]
am
efaa19d9: Fix fingerprint enrolling bug.
* commit '
efaa19d97d4aba1897357971af4c0991af71dbbd':
Fix fingerprint enrolling bug.
Jim Miller [Fri, 31 Jul 2015 21:05:25 +0000 (14:05 -0700)]
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
Maurice Lam [Fri, 31 Jul 2015 19:43:17 +0000 (19:43 +0000)]
am
88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit '
88832a3d4d48b94a3c43a6240dff75b5d486681b':
[Fingerprint] Disable back in setup enrolling screen
Geoff Mendal [Fri, 31 Jul 2015 19:41:55 +0000 (19:41 +0000)]
am
13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit '
13cbe05387fe387c88f39f9121a8283121e96bdc':
Import translations. DO NOT MERGE
Maurice Lam [Fri, 31 Jul 2015 18:50:39 +0000 (18:50 +0000)]
Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
Geoff Mendal [Fri, 31 Jul 2015 16:34:46 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22512392
Change-Id: I2a2bc8f493371e83373ec3587008f51a3cecc011
Jeff Sharkey [Fri, 31 Jul 2015 01:51:31 +0000 (01:51 +0000)]
am
c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit '
c7e59e52b45b66de74597a455023dd9fe4e07b3b':
Let Settings measure transient free space.
Jeff Sharkey [Fri, 31 Jul 2015 01:46:44 +0000 (01:46 +0000)]
Merge "Let Settings measure transient free space." into mnc-dev
Jeff Sharkey [Thu, 30 Jul 2015 23:55:42 +0000 (16:55 -0700)]
Let Settings measure transient free space.
Transient volumes like USB drives are only mounted at /mnt/media_rw,
but they still appear in Settings > Storage. To show stats like
free/used space, give Settings the permissions it needs to access
devices mounted there.
Bug:
22545248
Change-Id: I50be38f02f7d2bfe51d1ac0f76a04c340a21f936
Maurice Lam [Fri, 31 Jul 2015 00:48:43 +0000 (00:48 +0000)]
am
997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit '
997bcaa7d8486814540d8bcf1269918d8c48d960':
[Fingerprint] Advertise wake & unlock during SUW
Maurice Lam [Fri, 31 Jul 2015 00:43:58 +0000 (00:43 +0000)]
Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
Maurice Lam [Thu, 30 Jul 2015 22:07:58 +0000 (15:07 -0700)]
[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
Geoff Mendal [Thu, 30 Jul 2015 23:10:36 +0000 (23:10 +0000)]
am
6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit '
6b0a2d21e65ab1c29aec925380bbf43bab22c2c1':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 22:54:40 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22672924
Change-Id: I99789b790e682308514351a13025b9625ec085e1
Fyodor Kupolov [Thu, 30 Jul 2015 20:54:10 +0000 (20:54 +0000)]
am
c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
c3067882dbf00e424cd146181cf15f33ecb9f8f8':
Added android.permission.PEERS_MAC_ADDRESS permission
Fyodor Kupolov [Thu, 30 Jul 2015 20:50:03 +0000 (20:50 +0000)]
Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
Maurice Lam [Thu, 30 Jul 2015 20:29:20 +0000 (13:29 -0700)]
[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
Jorim Jaggi [Thu, 30 Jul 2015 20:22:14 +0000 (20:22 +0000)]
am
92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
* commit '
92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3':
Add dialog to confirm last fingerprint removal
Jorim Jaggi [Thu, 30 Jul 2015 20:16:08 +0000 (20:16 +0000)]
Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
Jorim Jaggi [Thu, 30 Jul 2015 19:41:42 +0000 (12:41 -0700)]
Add dialog to confirm last fingerprint removal
Bug:
22847296
Change-Id: Ib4984d8db0c9abc00442026360bd5617515225aa
Jeff Sharkey [Thu, 30 Jul 2015 19:32:36 +0000 (19:32 +0000)]
am
bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
* commit '
bb9d6b906e564c9f685834bb7dcccfbe0aa87a29':
Refresh after clearing, tweak warn threshold.
Jeff Sharkey [Thu, 30 Jul 2015 19:24:53 +0000 (19:24 +0000)]
Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
Jeff Sharkey [Thu, 30 Jul 2015 18:30:13 +0000 (11:30 -0700)]
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
Billy Lau [Thu, 30 Jul 2015 17:22:04 +0000 (17:22 +0000)]
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
Billy Lau [Thu, 30 Jul 2015 17:14:17 +0000 (17:14 +0000)]
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
Jason Monk [Thu, 30 Jul 2015 15:22:41 +0000 (15:22 +0000)]
am
19128bd1: Extend char limit by small amount
* commit '
19128bd1679cfcad3e38a447dd4584fa5280920f':
Extend char limit by small amount
Jason Monk [Thu, 30 Jul 2015 15:05:09 +0000 (11:05 -0400)]
Extend char limit by small amount
Bug:
22822007
Bug:
22687961
Change-Id: I9a1528dc7175cfd530900e51d2210224ff07ab23
Geoff Mendal [Thu, 30 Jul 2015 12:46:45 +0000 (12:46 +0000)]
am
597d75ea: (-s ours) Import translations. DO NOT MERGE
* commit '
597d75eaad03047d0f55c49ce9c0d788f5a72a72':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 12:35:46 +0000 (05:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7da1ba23b887e9ad682d65e57cc42d7a63c2caef
Auto-generated-cl: translation import
Geoff Mendal [Wed, 29 Jul 2015 22:50:48 +0000 (22:50 +0000)]
am
53f771d8: (-s ours) Import translations. DO NOT MERGE
* commit '
53f771d8218c553248d0954fba2f25b4257838b2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 22:31:28 +0000 (15:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I959a8c52fd330769880fd9b41894e404865a951e
Auto-generated-cl: translation import
Jorim Jaggi [Wed, 29 Jul 2015 22:14:09 +0000 (22:14 +0000)]
am
23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
* commit '
23ace01340906e9615f747b0adeaac4bf7bf1dc2':
Adjustments for find sensor screen
Billy Lau [Mon, 27 Jul 2015 11:57:07 +0000 (12:57 +0100)]
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
Jorim Jaggi [Wed, 29 Jul 2015 21:58:43 +0000 (21:58 +0000)]
Merge "Adjustments for find sensor screen" into mnc-dev
Maurice Lam [Wed, 29 Jul 2015 18:39:00 +0000 (18:39 +0000)]
am
3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
* commit '
3760e5e7e4ae17012cf0f336fa0d8d62ecbf5e69':
[ZenMode] Align text to viewStart in remove dialog
Maurice Lam [Wed, 29 Jul 2015 18:25:48 +0000 (18:25 +0000)]
Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:41:15 +0000 (17:41 +0000)]
am
00b5488c: Merge "Change assist app warning message text" into mnc-dev
* commit '
00b5488c67d3e7d1fd2905a24a6382f81026e5e7':
Change assist app warning message text
Julia Reynolds [Wed, 29 Jul 2015 17:41:14 +0000 (17:41 +0000)]
am
ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
* commit '
ae422fd0991e5dd8fab6816153ed0f4b6653beb0':
Change 'data' label to 'data usage'.
Julia Reynolds [Wed, 29 Jul 2015 17:26:12 +0000 (17:26 +0000)]
Merge "Change assist app warning message text" into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:25:41 +0000 (17:25 +0000)]
Merge "Change 'data' label to 'data usage'." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:15:14 +0000 (13:15 -0400)]
Change 'data' label to 'data usage'.
Bug:
22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c
Julia Reynolds [Wed, 29 Jul 2015 17:01:10 +0000 (13:01 -0400)]
Change assist app warning message text
Bug:
22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555
Chris Wren [Wed, 29 Jul 2015 16:11:21 +0000 (16:11 +0000)]
am
2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
* commit '
2a56d7f23b4ef87ffb44ab6fcc4fbae6283a3242':
fix InactiveApps instrumentation
Chris Wren [Wed, 29 Jul 2015 14:57:14 +0000 (14:57 +0000)]
Merge "fix InactiveApps instrumentation" into mnc-dev
Geoff Mendal [Wed, 29 Jul 2015 13:59:28 +0000 (13:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 29 Jul 2015 13:56:59 +0000 (06:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic5113dd5d45744811ac6ca45f037333b7f659362
Auto-generated-cl: translation import
Martijn Coenen [Wed, 29 Jul 2015 13:34:38 +0000 (13:34 +0000)]
am
edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
* commit '
edb2668c6d7d2ccfc3b7b42abcc9b46ffdf3d155':
Add contactless symbol to NFC resources.
Martijn Coenen [Wed, 29 Jul 2015 13:21:40 +0000 (13:21 +0000)]
Merge "Add contactless symbol to NFC resources." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:39:12 +0000 (12:39 +0000)]
am
300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
* commit '
300d6fd90c3b63948d86e140353604baa8339a34':
Use pattern visibility setting on confirm pattern screen.
Julia Reynolds [Wed, 29 Jul 2015 12:39:11 +0000 (12:39 +0000)]
am
f889faaf: Merge "Bump string char limit." into mnc-dev
* commit '
f889faaf0829f011225882b160aa61158a7f69c2':
Bump string char limit.
Julia Reynolds [Wed, 29 Jul 2015 12:25:54 +0000 (12:25 +0000)]
Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:25:28 +0000 (12:25 +0000)]
Merge "Bump string char limit." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 08:10:35 +0000 (10:10 +0200)]
Add contactless symbol to NFC resources.
Bug:
22534220
Change-Id: I9227d74386716520d2cf98d7f032051815f34431
Martijn Coenen [Wed, 29 Jul 2015 08:10:14 +0000 (08:10 +0000)]
am
8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
* commit '
8e7b9cf9f67344192de98c951c11f144d1cdcd13':
Fix tap & pay strings.
Martijn Coenen [Wed, 29 Jul 2015 07:54:04 +0000 (07:54 +0000)]
Merge "Fix tap & pay strings." into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 23:55:00 +0000 (16:55 -0700)]
Adjustments for find sensor screen
Bug:
22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170
Zach Johnson [Tue, 28 Jul 2015 22:57:58 +0000 (22:57 +0000)]
am
a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
* commit '
a425e86478b60c4eb1f90f47197fa244379879de':
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
Zach Johnson [Tue, 28 Jul 2015 22:36:31 +0000 (22:36 +0000)]
Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:54:07 +0000 (20:54 +0000)]
am
5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit '
5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0':
Prevent crash in app memory updater.
Julia Reynolds [Tue, 28 Jul 2015 20:54:06 +0000 (20:54 +0000)]
am
feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit '
feeae4cdebfa1303581dbd284039bcf91068addd':
Hide usage graph on app usage details pages.
Julia Reynolds [Tue, 28 Jul 2015 20:32:08 +0000 (20:32 +0000)]
Merge "Prevent crash in app memory updater." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:32:05 +0000 (20:32 +0000)]
Merge "Hide usage graph on app usage details pages." into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:08:01 +0000 (20:08 +0000)]
am
5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
* commit '
5458688c1a951142b9a0b7f74c4b57e5909a857d':
Make fingerprint error text a live region
Jorim Jaggi [Tue, 28 Jul 2015 20:08:00 +0000 (20:08 +0000)]
am
74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
* commit '
74af384cae9ea03f900c6f3aed2581477dedf68a':
Adjust enrollment UI for sw400 devices
Jorim Jaggi [Tue, 28 Jul 2015 20:07:58 +0000 (20:07 +0000)]
am
4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit '
4d9f5c91aeb7ab1ab9828bce45d5f0a7c3ba0716':
Don't use screenshot if structure is disabled (2/2)
Jorim Jaggi [Tue, 28 Jul 2015 19:51:03 +0000 (19:51 +0000)]
Merge "Make fingerprint error text a live region" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:49:43 +0000 (19:49 +0000)]
Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 19:49:39 +0000 (15:49 -0400)]
Prevent crash in app memory updater.
Bug:
22768769
Change-Id: I1eec14f5ffb46390aa6060babf86fc88ad76a16d
Jorim Jaggi [Tue, 28 Jul 2015 00:48:02 +0000 (17:48 -0700)]
Don't use screenshot if structure is disabled (2/2)
Bug:
22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034
Julia Reynolds [Tue, 28 Jul 2015 17:39:24 +0000 (13:39 -0400)]
Bump string char limit.
Bug:
19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837
Maurice Lam [Tue, 21 Jul 2015 18:36:43 +0000 (11:36 -0700)]
[ZenMode] Align text to viewStart in remove dialog
Bug:
22274462
Change-Id: I696c4b33c111a61b51e1581fd4a2830fc1844f40
Chris Wren [Tue, 28 Jul 2015 16:44:37 +0000 (12:44 -0400)]
fix InactiveApps instrumentation
Bug:
21114836
Change-Id: I84357981158d057c2d302822801fb54ad82a901c
Martijn Coenen [Mon, 27 Jul 2015 14:09:56 +0000 (16:09 +0200)]
Fix tap & pay strings.
Bug:
22534220
Bug:
22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7
Julia Reynolds [Tue, 28 Jul 2015 13:44:59 +0000 (09:44 -0400)]
Use pattern visibility setting on confirm pattern screen.
Bug:
22683055
Change-Id: Icc4c0c20175e09a0079f7a6bab93d3de6862f1a3
Julia Reynolds [Mon, 27 Jul 2015 20:00:06 +0000 (16:00 -0400)]
Hide usage graph on app usage details pages.
Also make the back button work properly on these pages.
Bug:
22691655
Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560
Jorim Jaggi [Tue, 28 Jul 2015 00:59:05 +0000 (17:59 -0700)]
Make fingerprint error text a live region
Bug:
22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d
Jorim Jaggi [Tue, 28 Jul 2015 00:50:45 +0000 (00:50 +0000)]
am
730389bd: Merge "Adjust choose assist app string" into mnc-dev
* commit '
730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
Adjust choose assist app string
Jorim Jaggi [Tue, 28 Jul 2015 00:50:44 +0000 (00:50 +0000)]
am
dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
* commit '
dcf61a2dfa392fa5994c4ad07869c02929989823':
Fix blank confirm device credential activity
Jorim Jaggi [Tue, 28 Jul 2015 00:39:12 +0000 (00:39 +0000)]
Merge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:36:00 +0000 (00:36 +0000)]
Merge "Fix blank confirm device credential activity" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:31:23 +0000 (17:31 -0700)]
Adjust enrollment UI for sw400 devices
Bug:
22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b
Jorim Jaggi [Mon, 27 Jul 2015 21:52:02 +0000 (14:52 -0700)]
Adjust choose assist app string
Bug:
22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f
Selim Cinek [Mon, 27 Jul 2015 21:11:31 +0000 (21:11 +0000)]
am
596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
* commit '
596ce9bab73204e9c0cd4a4efbb5602f8c6d0024':
Autocapitalizing the fingerprint names now
Selim Cinek [Mon, 27 Jul 2015 21:11:30 +0000 (21:11 +0000)]
am
a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
* commit '
a8c7c8c891c99ba49167fc0095aab404a85b94bb':
Added content description for the fingerprint icon
Selim Cinek [Mon, 27 Jul 2015 21:11:28 +0000 (21:11 +0000)]
am
95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
* commit '
95ddf903495f97f6d008f8723887228015ed7ead':
Adapted a string in the fingerprint enrollment flow
Selim Cinek [Mon, 27 Jul 2015 20:58:01 +0000 (20:58 +0000)]
Merge "Autocapitalizing the fingerprint names now" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:57:45 +0000 (20:57 +0000)]
Merge "Added content description for the fingerprint icon" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:57:23 +0000 (20:57 +0000)]
Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
Fyodor Kupolov [Mon, 27 Jul 2015 19:24:59 +0000 (12:24 -0700)]
Added android.permission.PEERS_MAC_ADDRESS permission
This permission is required for Settings to have access to BT/WiFi scan results
even if location is turned off.
Bug:
21852542
Bug:
22728628
Change-Id: I1b527f78077b45a326fd22d9b4ed92f9f806ff49
Jorim Jaggi [Mon, 27 Jul 2015 19:18:34 +0000 (19:18 +0000)]
am
58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit '
58d1995c904f12dfb00185af3dabfe267d50568a':
Move PIN/Pattern appear animation to RenderThread (2/2)
Jorim Jaggi [Mon, 27 Jul 2015 18:55:30 +0000 (18:55 +0000)]
Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
Jorim Jaggi [Fri, 24 Jul 2015 20:03:12 +0000 (13:03 -0700)]
Fix blank confirm device credential activity
Make sure to play the enter animation only once, so it is guaranteed
that we get onEnterAnimationComplete.
Bug:
22677671
Change-Id: Ia01bb33d6a90abb7dc26c9c12168e2c5ffab1b1d
Jason Monk [Mon, 27 Jul 2015 18:51:45 +0000 (18:51 +0000)]
am
3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '
3b521b60d3a1921b5231633105d1ca7afadd9978':
Battery summary - tint uid 0 icon
Jason Monk [Mon, 27 Jul 2015 18:36:10 +0000 (18:36 +0000)]
Merge "Battery summary - tint uid 0 icon" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 18:06:02 +0000 (18:06 +0000)]
am
08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit '
08cb39837f02f37b854e7a4598d6f48d41d1ce94':
Update battery optimization strings
Sanket Padawe [Mon, 27 Jul 2015 18:06:01 +0000 (18:06 +0000)]
am
ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
* commit '
ca258251521350421883a79f741ff872103e0ff4':
Fix issues in AP dialog arising after clicking on AP preferences.