OSDN Git Service
Bill Yi [Tue, 24 Oct 2017 20:42:12 +0000 (20:42 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
aa8a972ea3
am:
2ef76cb0d2
Change-Id: I906612380c00db46a4d71e8aeceb822af857f744
Fan Zhang [Tue, 24 Oct 2017 20:41:16 +0000 (20:41 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings" am:
2bcbc35b29
am:
e373209b97
Change-Id: I67452d72f814fc0a1f11fd7699a1134f03a00a6f
Bill Yi [Tue, 24 Oct 2017 20:33:44 +0000 (20:33 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
aa8a972ea3
Change-Id: I778b023dfa65b0e4a8ab681c77a6a98c48184e93
Fan Zhang [Tue, 24 Oct 2017 20:33:03 +0000 (20:33 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
am:
2bcbc35b29
Change-Id: I37d5d73c9dc2dc64c6437c8e1a2786df616ee2f6
Bill Yi [Tue, 24 Oct 2017 20:03:09 +0000 (20:03 +0000)]
Import translations. DO NOT MERGE
am:
66ecad49ba -s ours
Change-Id: I46bc589e7ad984e910b5ebfc118614d0d1b0bee0
Bill Yi [Tue, 24 Oct 2017 18:32:26 +0000 (11:32 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Fan Zhang [Tue, 24 Oct 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68159303
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
tiansiming [Tue, 24 Oct 2017 09:19:27 +0000 (17:19 +0800)]
Fix wrong position of cursor in OwnerInfoSettings
Bug:N/A
Test:Settings -> Security -> right settings icon of Screen lock
-> Lock screen message.
The cursor shows at the forefront of this EditText.
Change-Id: I86fe1bdbe78f700053e38b0cba4a5c8365af946e
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Rajeev Kumar [Tue, 24 Oct 2017 05:01:49 +0000 (05:01 +0000)]
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
am:
dd8e66fa20
Change-Id: I0b27a9c68a17f87876d477bad0d10b270aecd550
Rajeev Kumar [Fri, 20 Oct 2017 19:44:17 +0000 (12:44 -0700)]
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
This change will prevent showing Data plan usage in the settings search.
Data plan usage feature has been punted to next release and we do not
want to show this to user in current release.
Bug:
68022715
Test: make RunSettingsRoboTests -j40
Change-Id: I56b71796e3c426122434ca9e86c1a2db691849cf
DO NOT MERGE
Fan Zhang [Tue, 24 Oct 2017 00:27:02 +0000 (00:27 +0000)]
Add strings to support multi-state vivid color management
am:
e1543a3895
Change-Id: Icc99c1e3348425d70fea3235a4d4c63385c3d38f
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management
Bug:
68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
Jack Yu [Fri, 20 Oct 2017 19:52:40 +0000 (19:52 +0000)]
Merge "Refactored area update info support" am:
60d6ffbc6c am:
3966912efa
am:
d4ef8eca27
Change-Id: I969c83a120ab14b5b3aed1c8ef26c9b1970b510d
Jack Yu [Fri, 20 Oct 2017 19:41:05 +0000 (19:41 +0000)]
Merge "Refactored area update info support" am:
60d6ffbc6c
am:
3966912efa
Change-Id: Id337bec84de9d6725974cca94945ba20ebe0e63d
Jack Yu [Fri, 20 Oct 2017 19:30:29 +0000 (19:30 +0000)]
Merge "Refactored area update info support"
am:
60d6ffbc6c
Change-Id: I955c44c5d2c07dee0be7ae9990c0234eb989538f
Treehugger Robot [Fri, 20 Oct 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Refactored area update info support"
Bill Yi [Fri, 20 Oct 2017 17:15:14 +0000 (17:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
a5d652c89f -s ours
am:
8313368b32 -s ours
Change-Id: Id8ca07902a1ec999a3924f4f77d1318da68a6cef
Bill Yi [Fri, 20 Oct 2017 16:47:03 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
a5d652c89f -s ours
Change-Id: I10da6389cb21f6c4ddcc4b6047feed58c48bd665
Ben Schwartz [Fri, 20 Oct 2017 15:33:50 +0000 (15:33 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am:
c8207de343 am:
ed97eaeb4a
am:
1fd46833ef
Change-Id: I30f6c28acc3825ff51190d1d54494cac5d774497
TreeHugger Robot [Fri, 20 Oct 2017 15:28:33 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Ben Schwartz [Fri, 20 Oct 2017 15:15:14 +0000 (15:15 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am:
c8207de343
am:
ed97eaeb4a
Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240
Ben Schwartz [Fri, 20 Oct 2017 15:06:10 +0000 (15:06 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
am:
c8207de343
Change-Id: I688d2131294c2b4995d7f8f79e7819feb89573c3
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
Bill Yi [Fri, 20 Oct 2017 10:21:50 +0000 (03:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623
Jack Yu [Thu, 22 Jun 2017 00:43:43 +0000 (17:43 -0700)]
Refactored area update info support
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug:
37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit
c3cab8ecb84051abac144aaa0f94ee9276c89aab)
tiansiming [Thu, 19 Oct 2017 19:24:53 +0000 (19:24 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am:
3a3044eeef am:
92e77cbd43
am:
ecf2bdb46f
Change-Id: I643bffc3f0eaf326b79dd7cebce2fff287396e1e
tiansiming [Thu, 19 Oct 2017 19:22:16 +0000 (19:22 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am:
3a3044eeef
am:
92e77cbd43
Change-Id: Icfa12295c4111766f4c189443b9a6997a1cc0031
tiansiming [Thu, 19 Oct 2017 19:20:09 +0000 (19:20 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
am:
3a3044eeef
Change-Id: I26f1c35505538768a7816f038c44437fe9a08f67
Treehugger Robot [Thu, 19 Oct 2017 19:14:49 +0000 (19:14 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
tiansiming [Mon, 16 Oct 2017 13:32:20 +0000 (21:32 +0800)]
Fix wrong position of cursor in IccLockSettings
Position of cursor goes to the front when submit
an error pin.
Bug:https://issuetracker.google.com/issues/
67839176
Test:
1) Insert a sim card
2) Go to Settings -> Security -> Set up SIM card lock
3) press Lock SIM card checkbox
4) enter 123 and press OK button
Change-Id: I90655f3fa4cb3e4bda251cd0fc62e66300a4b66f
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Jeff Sharkey [Wed, 18 Oct 2017 22:55:51 +0000 (22:55 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0 am:
16776b64c8
am:
1dcb8522fa
Change-Id: Ife1efc0fe5b721886961327dc72b6fcf2cf1ade9
Jeff Sharkey [Wed, 18 Oct 2017 22:54:01 +0000 (22:54 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12 am:
3de9e565c8
am:
1e23fc8814
Change-Id: Id4d0641a44fb537a5606e8c118ffdbc93aaf0ae2
Jeff Sharkey [Wed, 18 Oct 2017 22:27:47 +0000 (22:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0 am:
16776b64c8
am:
6b56423651
Change-Id: I18058b80f7f7439f875213d5f6e59b2680cc3dc5
Jeff Sharkey [Wed, 18 Oct 2017 22:26:30 +0000 (22:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12 am:
3de9e565c8
am:
e39f0c21f9
Change-Id: Ib7da524b1e6c64ded9706fedfe487aa99d43e22a
Jeff Sharkey [Wed, 18 Oct 2017 21:52:46 +0000 (21:52 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0
am:
16776b64c8
Change-Id: I96d84487e79ac34428c1b784228745074499cbd9
Jeff Sharkey [Wed, 18 Oct 2017 21:52:01 +0000 (21:52 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0
am:
16776b64c8
Change-Id: I83e412e91bdc14523b26ac11fc0918a21b74a26f
Jeff Sharkey [Wed, 18 Oct 2017 21:51:30 +0000 (21:51 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12
am:
3de9e565c8
Change-Id: I965ee6c01f5394f390900002295b3d695790d00d
Jeff Sharkey [Wed, 18 Oct 2017 21:50:29 +0000 (21:50 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12
am:
3de9e565c8
Change-Id: Id3c4eafd2628d04b94e33e057b228ed77c9c32c8
Jeff Sharkey [Wed, 18 Oct 2017 21:32:46 +0000 (21:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours
am:
a00521b3a0
Change-Id: Idd7111058107886b24ed208ad09d3b13e945de8d
Jeff Sharkey [Wed, 18 Oct 2017 21:31:42 +0000 (21:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours
am:
a829548c12
Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69
Jeff Sharkey [Wed, 18 Oct 2017 21:01:38 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5
am:
a637e31547 -s ours
Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff
Jeff Sharkey [Wed, 18 Oct 2017 21:00:49 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3
am:
2a2d92eee8 -s ours
Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710
Jeff Sharkey [Wed, 18 Oct 2017 20:40:16 +0000 (20:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49
am:
397a3555b5
Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
Jeff Sharkey [Wed, 18 Oct 2017 20:39:11 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da
am:
8f2a69fad3
Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c
Jeff Sharkey [Wed, 18 Oct 2017 20:26:31 +0000 (20:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6
am:
629553fb49
Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550
Jeff Sharkey [Wed, 18 Oct 2017 20:25:25 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd
am:
85cb0b43da
Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa
Jeff Sharkey [Wed, 18 Oct 2017 20:06:55 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed
am:
d88820f3f6
Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89
Jeff Sharkey [Wed, 18 Oct 2017 20:06:00 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3
am:
e341fe95bd
Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
Jeff Sharkey [Wed, 18 Oct 2017 19:40:12 +0000 (19:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours
am:
07c4c8efed
Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f
Jeff Sharkey [Wed, 18 Oct 2017 19:39:10 +0000 (19:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours
am:
416ecb20a3
Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
Jeff Sharkey [Wed, 18 Oct 2017 19:27:49 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716
am:
91b1cb4b23 -s ours
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
Jeff Sharkey [Wed, 18 Oct 2017 19:27:11 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0
am:
fad1e6a315 -s ours
Change-Id: I46e94b20903455f26c62922aa735276434dc1fd0
Jeff Sharkey [Wed, 18 Oct 2017 19:21:53 +0000 (19:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c
am:
a954c8c716
Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545
Jeff Sharkey [Wed, 18 Oct 2017 19:20:50 +0000 (19:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9
am:
c1ebc09ff0
Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520
Jeff Sharkey [Wed, 18 Oct 2017 18:57:57 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39
am:
2bf724509c
Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326
Jeff Sharkey [Wed, 18 Oct 2017 18:57:03 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787
am:
9ba609cef9
Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
Jeff Sharkey [Wed, 18 Oct 2017 18:40:10 +0000 (18:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours
am:
19fa568b39
Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc
Jeff Sharkey [Wed, 18 Oct 2017 18:39:25 +0000 (18:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours
am:
5b2a431787
Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf
Jeff Sharkey [Wed, 18 Oct 2017 18:29:15 +0000 (18:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours
am:
45fc104958 -s ours
Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb
Jeff Sharkey [Wed, 18 Oct 2017 18:28:28 +0000 (18:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
4cfc684346 -s ours
Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428
Pavel Grafov [Tue, 17 Oct 2017 17:33:23 +0000 (17:33 +0000)]
Preserve old password when handling SET_NEW_PASSWORD.
am:
40e187b364
Change-Id: I45a464c244b6de3a4ea491d28db620425733b5a8
Pavel Grafov [Wed, 11 Oct 2017 21:57:09 +0000 (22:57 +0100)]
Preserve old password when handling SET_NEW_PASSWORD.
Currently the only way mUserPassword can be set is when it comes
from onActivityResult. This way when the user chooses "Continue
without Pixel Imprint", and we switch ChooseLockGeneric->InternalActivity,
mUserPassword becomes null (it is not preserved in intent extras).
And then this null is used in getLockPasswordIntent which causes the issue.
Another issues is that when the user chooses to use fingerprint,
mHasChallenge is set to true and password is not forwarded to
ChooseLock(Password|Pattern). I changed the intent builders so that both
old password and challenge can be sent at the same time, so the password
is not lost when fingerprint is set.
Bug:
67672081
Test: cd packages/apps/Settings/tests/robotests/ && mma
Test: manual, adb shell am start -a android.app.action.SET_NEW_PASSWORD,
tried setting pin/password with and without fingerprint.
Test: manual, tried to change lock via Settings -> Security&Location
Test: manual, set pin + fingerprint in Setup Wizard, FBE and FDE devices
Test: manual, set pin + added account, used pin to unlock FRP in SUW
Change-Id: I38d56d84f95c63fef24c2aa1a031d629f22756a1
Cai, Min1 [Mon, 16 Oct 2017 19:59:50 +0000 (19:59 +0000)]
Merge "Refresh payment preference while resume" am:
05650bb3da am:
088baf348b
am:
f523ca10aa
Change-Id: I25dea8b9ddb1740c907d4ef79c74fe8b201352a2
Cai, Min1 [Mon, 16 Oct 2017 19:41:44 +0000 (19:41 +0000)]
Merge "Refresh payment preference while resume" am:
05650bb3da
am:
088baf348b
Change-Id: I146f0925e1b9c68e2cd04d76897a59fe87ac741d
Cai, Min1 [Mon, 16 Oct 2017 19:29:33 +0000 (19:29 +0000)]
Merge "Refresh payment preference while resume"
am:
05650bb3da
Change-Id: Ib4876e7d4f17b99699f3b7f328cd1b1eafb19eba
Maurice Lam [Mon, 16 Oct 2017 19:25:57 +0000 (19:25 +0000)]
resolve merge conflicts of
f36b25c2df to stage-aosp-master am:
d4621f6302
am:
0e1c486e74
Change-Id: I9b94c26c4df2329e388eeb925350a2446ef9148e
Maurice Lam [Mon, 16 Oct 2017 19:22:12 +0000 (19:22 +0000)]
resolve merge conflicts of
f36b25c2df to stage-aosp-master
am:
d4621f6302
Change-Id: I7f2e89579a99523808138eaabffa917b1e02e3b0
Maurice Lam [Mon, 16 Oct 2017 18:30:19 +0000 (11:30 -0700)]
resolve merge conflicts of
f36b25c2df to stage-aosp-master
Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
Daniel Nishi [Sun, 15 Oct 2017 04:30:40 +0000 (04:30 +0000)]
Merge "Fix PrivateVolumeSettings be launched repeatedly" am:
31a7b2a4c7 am:
5973d32c77
am:
f1dc9e65f1
Change-Id: Ib55d4b211b48f4a6e18034f60d91f43748aebe89
Daniel Nishi [Sun, 15 Oct 2017 03:59:02 +0000 (03:59 +0000)]
Merge "Fix PrivateVolumeSettings be launched repeatedly" am:
31a7b2a4c7
am:
5973d32c77
Change-Id: I66747a250e7461cfc3fe04fb8228bb7fe7541b5a
Daniel Nishi [Sun, 15 Oct 2017 03:47:13 +0000 (03:47 +0000)]
Merge "Fix PrivateVolumeSettings be launched repeatedly"
am:
31a7b2a4c7
Change-Id: I2ee1fe82349968182b21a716a36ac716c0425080
Doris Ling [Sun, 15 Oct 2017 02:43:43 +0000 (02:43 +0000)]
Update tile limit for Sound settings.
am:
893bdba206
Change-Id: Ie73472f54d737ae8058ff95a65d16068750ace24
Treehugger Robot [Fri, 13 Oct 2017 23:10:13 +0000 (23:10 +0000)]
Merge "Refresh payment preference while resume"
Treehugger Robot [Fri, 13 Oct 2017 21:45:18 +0000 (21:45 +0000)]
Merge "There is no NEXT button in find sensor screen of fingerprint."
Doris Ling [Fri, 13 Oct 2017 18:45:30 +0000 (11:45 -0700)]
Update tile limit for Sound settings.
Pull the notification and alarm ringtone out of the preference category
and update the tile limit to 1, so that only the first preference
category will be displayed initially.
Change-Id: I9ae7669fb2b688560a3fc228274ea44f225b262f
Fixes:
67750626
Test: visual
Daniel Nishi [Fri, 13 Oct 2017 17:52:58 +0000 (17:52 +0000)]
Merge "Fix PrivateVolumeSettings be launched repeatedly"
Glen Kuhne [Thu, 12 Oct 2017 19:02:55 +0000 (19:02 +0000)]
Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
am:
85f59ff42d
Change-Id: I0812fdee8ad859cb7efb56f980de4ca00ce3f5a5
TreeHugger Robot [Thu, 12 Oct 2017 18:54:43 +0000 (18:54 +0000)]
Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
Cai, Min1 [Wed, 11 Oct 2017 08:31:22 +0000 (17:31 +0900)]
Refresh payment preference while resume
To show latest payment service list on Tap&pay menu.
Test: install payment service and go back to Tap&pay menu
Bug:
67718335
Change-Id: I6f421176b9c461898224b50d06f67a49645f0d18
Jeff Sharkey [Wed, 11 Oct 2017 23:03:25 +0000 (23:03 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
5ef2cfac97 -s ours
Change-Id: I5b16d712ea2e7b7c98ccef5fc74fa47527e588e0
Jeff Sharkey [Wed, 11 Oct 2017 22:50:08 +0000 (22:50 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours am:
952ae3ec34 am:
8b399b3eb7
am:
e9aa79dd1f
Change-Id: I5b0bd87504fa0843333bdbe01f9d96be3a4dabec
Jeff Sharkey [Wed, 11 Oct 2017 22:48:33 +0000 (22:48 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours am:
0f53a56cbd am:
9138455b41
am:
1ddfd32006
Change-Id: Idcf3281d27502eeebe23e846dc7f3165dd4ada47
Jeff Sharkey [Wed, 11 Oct 2017 22:40:15 +0000 (22:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours am:
952ae3ec34 am:
8b399b3eb7
am:
1c4d686b0c
Change-Id: I2258de70628d91b3e3955391bc5ef999e2865c2d
Jeff Sharkey [Wed, 11 Oct 2017 22:38:38 +0000 (22:38 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours am:
0f53a56cbd am:
9138455b41
am:
dcd1c0dde1
Change-Id: Ie97f00549bf2299165f5a32d72feae14fc92b796
Bill Yi [Wed, 11 Oct 2017 22:37:09 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c43238e7f4 -s ours
Change-Id: Idbf4df00a798f85d78e1953745659f09d4290c65
Jeff Sharkey [Wed, 11 Oct 2017 22:36:31 +0000 (22:36 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours am:
47bc5fba05 am:
4d61a1bd15
am:
91719dc7bd
Change-Id: I364e8d1b5239ef75e73236192e48ae936677f6fb
Jeff Sharkey [Wed, 11 Oct 2017 22:35:01 +0000 (22:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours am:
b410435a21 am:
de7c312543
am:
fb1bd3b2c6
Change-Id: I395dc28cb99328191e93c2096bfdcb7889e82082
Jeff Sharkey [Wed, 11 Oct 2017 22:33:45 +0000 (22:33 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am:
9c39da39df am:
f4e2e26064
am:
d563d23d26
Change-Id: Id82fbbac6455d22623355e0f4c5e24733bd5d6e3
Jeff Sharkey [Wed, 11 Oct 2017 22:25:38 +0000 (22:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours am:
952ae3ec34
am:
8b399b3eb7
Change-Id: I29ec2e1b7fdfb6cc28ad011edaea2c2f2377fdf8
Jeff Sharkey [Wed, 11 Oct 2017 22:23:51 +0000 (22:23 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours am:
0f53a56cbd
am:
9138455b41
Change-Id: I215d463a0b3631384c6963bd8217c912c286f594
Jeff Sharkey [Wed, 11 Oct 2017 22:19:18 +0000 (22:19 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours am:
952ae3ec34
am:
8b399b3eb7
Change-Id: I42b7d928abb3e1ae71f6e23ddceba969a821f639
Jeff Sharkey [Wed, 11 Oct 2017 22:17:49 +0000 (22:17 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours am:
0f53a56cbd
am:
9138455b41
Change-Id: Iaad4be44e1410eac3b0b63d33953bf643d2b3503
TreeHugger Robot [Wed, 11 Oct 2017 22:16:37 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 22:02:29 +0000 (22:02 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44 am:
e803004863 -s ours
am:
952ae3ec34
Change-Id: I40c3ad091c63617baf047a6ce98ad5129d04e7dc
Jeff Sharkey [Wed, 11 Oct 2017 22:00:24 +0000 (22:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3 am:
3aa36a6afb am:
250d5e60b0 -s ours
am:
0f53a56cbd
Change-Id: I8ee12f143c82b42ca3d06537e1d576577c22c883
Jeff Sharkey [Wed, 11 Oct 2017 21:47:52 +0000 (21:47 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours am:
47bc5fba05
am:
4d61a1bd15
Change-Id: I7f3fc44f882eed0a435e75cec95c7a03219cc67a
Jeff Sharkey [Wed, 11 Oct 2017 21:46:44 +0000 (21:46 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours am:
b410435a21
am:
de7c312543
Change-Id: If4193b75eaccdc612b94af027a8ce6548e613aad
Jeff Sharkey [Wed, 11 Oct 2017 21:45:11 +0000 (21:45 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am:
9c39da39df
am:
f4e2e26064
Change-Id: I7a621bcf8afdc1a3cb80e7e57d25adf5f96a17f0
Jeff Sharkey [Wed, 11 Oct 2017 21:42:57 +0000 (21:42 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d am:
d721694b79 am:
2433b6dc44
am:
e803004863 -s ours
Change-Id: If486735b63d2f652bd8d99a01a18f4d5fd8a88bc
OSDN Git Service
