Dmitry Dementyev
3a5e567ab9
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c
...
am: 5c4276a258
Change-Id: Iba7445a15febacfd49ee8a415d8b5a02691b084b
2017-03-08 19:11:13 +00:00
Dmitry Dementyev
5c4276a258
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
...
am: e24780ed4c
Change-Id: I2fe71909a4b3873fc4e14f7c28b50b0418f85dd1
2017-03-08 19:08:40 +00:00
Dmitry Dementyev
e24780ed4c
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
...
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:
2017-03-07 19:52:02 -08:00
Dmitry Dementyev
75ae46d035
Add permission check to Intents used by Authenticator Settings.
...
Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.
Bug: 33123882
Test: manual tests
Change-Id: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
2017-02-21 11:05:45 -08:00
Junda Liu
77f75b3859
Ignore orientation change to preserve ApnEditor.
...
am: f414d58ddf
Change-Id: I76b7df13239829f0fbba24db30babf640b2506fd
2017-02-17 18:02:35 +00:00
Junda Liu
f414d58ddf
Ignore orientation change to preserve ApnEditor.
...
Test: manually w/ Vzw and Tmo SIM on marlin. UI rotates while preserving
all values
Bug: b/34956985
Change-Id: I1db34893fd91f99e38913565e7b67ccbfdcb0c93
(cherry picked from commit 76ad635ef7 )
2017-02-08 18:04:24 +00:00
Fan Zhang
f3e86ca481
Fix crash when opening account sync detail for external app
...
am: c9cdc25f41
Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e
2016-11-01 17:21:36 +00:00
Fan Zhang
c9cdc25f41
Fix crash when opening account sync detail for external app
...
Bug: 32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit e3ad2b56c3 )
2016-10-31 21:57:36 +00:00
Bill Yi
4666b50754
Import translations. DO NOT MERGE am: bb6af9902d -s ours
...
am: 061b294714 -s ours
Change-Id: If6f1925ffdab47128db255040e97a45733f819d5
2016-10-27 05:27:37 +00:00
Bill Yi
f8b4927683
Import translations. DO NOT MERGE
...
am: e7f9b0b30b -s ours
Change-Id: I4297eed21e6b8854801a3e9a6f9904b1dadaab72
2016-10-27 05:27:22 +00:00
Bill Yi
061b294714
Import translations. DO NOT MERGE
...
am: bb6af9902d -s ours
Change-Id: I601e2eb4a89830873bee3f05b77d90b0e9dff9bb
2016-10-27 05:22:55 +00:00
Bill Yi
bb6af9902d
Import translations. DO NOT MERGE
...
Change-Id: Ie7733c16a2d1b8502a2b33e10fe0c4fa0e6d9138
Auto-generated-cl: translation import
2016-10-26 21:04:20 -07:00
Bill Yi
e7f9b0b30b
Import translations. DO NOT MERGE
...
Change-Id: I593dba1b6fda93a08279272c8e4061c464899afc
Auto-generated-cl: translation import
2016-10-26 20:51:47 -07:00
Steven Ng
046a63450f
Nexus imprint setting is missing while adding corp account from SUW
...
am: 378dec1495
Change-Id: I829c9738c70ec8242fb2c3fdcf7eecd5ff39df7c
2016-10-25 22:15:03 +00:00
Steven Ng
378dec1495
Nexus imprint setting is missing while adding corp account from SUW
...
+ This is caused by the encryption interstitial result code not handled
in ChooseLockGeneric. Change the request code of launching encryption
interstitial screen to CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST if it
is set new password flow.
Testing
Test: See below
1) Auto
make RunSettingsRoboTests
2) Manual
On a device (Nexus 5x) that shows encryption interstital screen and
supports fingerprint.
1) Nexus imprint flow (regression test)
Fingerprint can be enrolled with the following flow.
Settings > Security > Nexus Imprint > FingerprintEnrollIntroduction
> ChooseLockGeneric (Unlock selection) > Encryption Interstitial
> Password setup > Notification Interstitial
> Find sensor and fingerprint enrollment
2) Set new password test
i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
ii) Click Nexus Imprint + Pattern.
iii) Choose "Require pattern to start device"
iv) Set a pattern lock.
v) Choose any of the notification behavior.
vi) Can enroll a fingerprint.
Bug: 32382952
Change-Id: Ie66ffca2e8c3cc46b5e8b619bd35986e4f41d5ab
2016-10-25 20:01:23 +00:00
Bill Yi
f8032d0b15
Import translations. DO NOT MERGE am: a6d9842695 -s ours
...
am: c027907edc -s ours
Change-Id: I09c421885fb40a57e309a083413797bac5de053b
2016-10-25 06:30:52 +00:00
Bill Yi
9a22968ff8
Import translations. DO NOT MERGE
...
am: 475763d01c -s ours
Change-Id: I4b54504ffad69e916590de47d505979b82325827
2016-10-25 06:30:37 +00:00
Bill Yi
c027907edc
Import translations. DO NOT MERGE
...
am: a6d9842695 -s ours
Change-Id: Ic902f00f1abc643ecfb2e567d7368815bf727d62
2016-10-25 06:30:08 +00:00
Bill Yi
a6d9842695
Import translations. DO NOT MERGE
...
Change-Id: Ic23d8689a23264722dd70856138fbda6a214e7cb
Auto-generated-cl: translation import
2016-10-24 12:40:25 -07:00
Bill Yi
475763d01c
Import translations. DO NOT MERGE
...
Change-Id: Ie8400c22cf5931503997d0dc93b0358ee40c89d7
Auto-generated-cl: translation import
2016-10-24 12:27:49 -07:00
Doris Ling
5e4fce04fb
Ensure that the gesture animation video is paused properly.
...
am: 4245ad4771
Change-Id: Ib6bd653fe0f1fd0859c37df4655908e67ecc4444
2016-10-21 23:44:19 +00:00
Doris Ling
4245ad4771
Ensure that the gesture animation video is paused properly.
...
Add the handling to pause the animation video when user navigates away
from the gesture settings.
Test: Manual - play gesture animation videos, then switch to another app
in recents. Verifies from logcat that NuPlayerDriver is not active.
Fix: 32064123
Change-Id: I3d0fb3946e4d0d77a686aa97cfabe667862cac17
2016-10-21 14:28:54 -07:00
Matthew Fritze
2da1ca120f
Merge "Support tile title text line wraps" into nyc-mr1-dev
...
am: f5cd60372c
Change-Id: Ie0d699bcc355519060df04b46b213ce368e47e6a
2016-10-21 16:36:20 +00:00
Matthew Fritze
0e0e6c5544
Support tile title text line wraps
...
am: 0f813d668d
Change-Id: I47a4f7f95f0bce43a55e661209d48142f82e5b42
2016-10-21 16:36:19 +00:00
TreeHugger Robot
f5cd60372c
Merge "Support tile title text line wraps" into nyc-mr1-dev
2016-10-21 16:30:50 +00:00
Matthew Fritze
0f813d668d
Support tile title text line wraps
...
Change-Id: Ice430d03877618aacad21e5ee6167516f60f02fd
Fixes: 32239411
Test: Manual
2016-10-20 17:50:11 -07:00
Fan Zhang
723fbd06a9
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
...
am: 08254e5b4f
Change-Id: Ia9c30a0a03a1dcaec42573c3578f5a1ed80aa9b6
2016-10-20 20:25:38 +00:00
Fan Zhang
7568e120cf
Fix help & feedback link in data usage summary screen.
...
am: 9b52836251
Change-Id: I1417eebbf5218baa24a79f2f1988844b8d06d674
2016-10-20 20:25:37 +00:00
TreeHugger Robot
08254e5b4f
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
2016-10-20 20:18:44 +00:00
Bill Yi
d0c5d246c8
Import translations. DO NOT MERGE am: 4bfccb32a7 -s ours
...
am: 4559d2bfac -s ours
Change-Id: Iff8ca804ae251a0462f148a236e7b4e8c9dd3e4d
2016-10-20 16:33:20 +00:00
Bill Yi
4559d2bfac
Import translations. DO NOT MERGE
...
am: 4bfccb32a7 -s ours
Change-Id: I7c16649111b0057307773f7674c11c1aa9732c4c
2016-10-20 16:25:35 +00:00
Bill Yi
d5bc80036b
Import translations. DO NOT MERGE
...
am: 7e6e9220da -s ours
Change-Id: Ibe7e7a4797602978d09a44aab39f49045f029748
2016-10-20 16:17:21 +00:00
Fan Zhang
9b52836251
Fix help & feedback link in data usage summary screen.
...
The fragment was not providing the correct string for help & feedback
button, causing no result page when user navigates to help article page
from actionbar overflow menu.
Change-Id: I076846c44d4fc95efea743f019a7ad4aab47f214
Fixes: 32291069
Test: manual
2016-10-20 09:13:36 -07:00
Bill Yi
4bfccb32a7
Import translations. DO NOT MERGE
...
Change-Id: I2490d08d85215767e05bf193c3e352c3ab7a7ce9
Auto-generated-cl: translation import
2016-10-20 07:52:52 -07:00
Bill Yi
7e6e9220da
Import translations. DO NOT MERGE
...
Change-Id: I60964278429db5003b317b04e53324fc312116d5
Auto-generated-cl: translation import
2016-10-20 07:48:07 -07:00
Anna Galusza
b104675957
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
...
am: ee502d5037
Change-Id: I23a6c8eb6911902fc9b9ecab8bb87e38c73371b5
2016-10-20 03:38:11 +00:00
Anna Galusza
5bf1f668ff
Fix insufficint contrast on Vision Settings toggles.
...
am: e212817785
Change-Id: I9969b046d52d6aff86fe6b0f5d44cce2cf49e8dd
2016-10-20 03:38:11 +00:00
Anna Galusza
ee502d5037
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
2016-10-20 03:32:22 +00:00
Anna Galusza
e212817785
Fix insufficint contrast on Vision Settings toggles.
...
Bug: 29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132
2016-10-19 15:41:00 -07:00
Adrian Roos
f33b98b750
Merge "Separate ambient display triggers" into nyc-mr1-dev
...
am: ee5eef1492
Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48
2016-10-18 22:16:39 +00:00
Adrian Roos
5ba2074e31
Separate ambient display triggers
...
am: 82829ee0b1
Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62
2016-10-18 22:07:11 +00:00
Adrian Roos
ee5eef1492
Merge "Separate ambient display triggers" into nyc-mr1-dev
2016-10-18 22:00:08 +00:00
Lei Yu
b4969f5b6f
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
...
am: 7fee46383f
Change-Id: I0adb924d05bed16bb6415f2b8edf69e509d7fe72
2016-10-18 16:54:04 +00:00
jackqdyulei
221b9157b4
Suspend action in security patch when browser is disabled
...
am: 013da34209
Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0
2016-10-18 16:54:03 +00:00
Lei Yu
7fee46383f
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
2016-10-18 16:45:35 +00:00
Bill Yi
a95e430c93
Import translations. DO NOT MERGE am: 6515783df6 -s ours
...
am: 37c5dd0fe3 -s ours
Change-Id: Ia6d04b243b2338687963f234374d44a76a8bfae8
2016-10-18 05:40:29 +00:00
Bill Yi
987866df87
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 5ffabbe58b -s ours
Change-Id: I97a96da052f14ecd9901ef7aee42cfdbaf284cbf
2016-10-18 05:40:02 +00:00
Bill Yi
4367ed325e
Import translations. DO NOT MERGE
...
am: ccde0787b8 -s ours
Change-Id: I7ee7d06fa217a520809ade396be78dddc63b3109
2016-10-18 05:40:01 +00:00
Bill Yi
37c5dd0fe3
Import translations. DO NOT MERGE
...
am: 6515783df6 -s ours
Change-Id: I4afd6c7910dde3c52771687f6fa8bfbe55e56894
2016-10-18 05:37:33 +00:00
TreeHugger Robot
5ffabbe58b
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-18 05:30:53 +00:00