OSDN Git Service
Fan Zhang [Thu, 18 May 2017 01:11:00 +0000 (01:11 +0000)]
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
am:
2b030aeb65
Change-Id: I4c13fb0ce652108fdabbaa8ca215a5799374c8f8
Fan Zhang [Thu, 18 May 2017 01:05:38 +0000 (01:05 +0000)]
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
Fan Zhang [Thu, 18 May 2017 01:01:12 +0000 (01:01 +0000)]
Merge "Fix robolectric test failure" into oc-dev
am:
2545bcaa74
Change-Id: I632edffaced0b4ce7d391d525c4d9288e5ba97cc
Fan Zhang [Thu, 18 May 2017 00:41:17 +0000 (00:41 +0000)]
Merge "Fix robolectric test failure" into oc-dev
Fan Zhang [Wed, 17 May 2017 19:32:59 +0000 (12:32 -0700)]
Fix bug where accounts are duplicated in user&account list.
This happens when user has different accounts with same account name. For
example: user@domain.com for type1 and same email for type2, etc. When
we refresh the account list during onResume(), the same account name
incorrectly causes the logic to think they are the same account and
updates the account list by mistake.
- Introduced a util method to generate unique key from Account object.
And set it as preference key.
- when updating preference on screen, use key to find preference instead
of the preference instance itself.
Change-Id: I0aa692cb965b7037155a746389a919cd155843da
Fix:
34035653
Test: make RunSettingsRoboTests
Youhan Wang [Wed, 17 May 2017 23:42:49 +0000 (23:42 +0000)]
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
am:
350ba4a4c3
Change-Id: Ia508085e2fe2dd2061d772b0caf976d039aaa213
Youhan Wang [Wed, 17 May 2017 23:38:07 +0000 (23:38 +0000)]
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
Steven Ng [Wed, 17 May 2017 22:49:14 +0000 (22:49 +0000)]
Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp
am:
3b76c25cee -s ours
Change-Id: I6b9f260b8494ced24cd758207981d60c9a5ca97e
Fan Zhang [Wed, 17 May 2017 22:37:03 +0000 (15:37 -0700)]
Fix robolectric test failure
Default UserManager caches instance across entire test suite, so
test becomes flakey depending on the order they are run. Using a
a ShadowUserManager without the cache ensures each test class gets
a UserManager with clean state.
Change-Id: Ia54f6a3259859add5a1e5d0101829497fb985ab1
Fix:
38393235
Test: make RunSettingsRoboTests
Steven Ng [Wed, 17 May 2017 22:43:10 +0000 (22:43 +0000)]
Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp
Steven Ng [Wed, 17 May 2017 22:30:42 +0000 (23:30 +0100)]
DO NOT MERGE Fix build failure due to missing guava target
Test: 1) build sailfish-userdebug successfully
2) m SettingsTests -j32 built successfully
Bug:
33059280
Change-Id: If1c281888e4581b5eb3b8842892464aebd04b827
Steven Ng [Wed, 17 May 2017 21:05:09 +0000 (21:05 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791 am:
e05ef08a8e -s ours am:
6496c3757b -s ours
am:
9eeb954d39 -s ours
Change-Id: I10aad8dbfe4b42a887b2166608456595640e0feb
Steven Ng [Wed, 17 May 2017 21:04:40 +0000 (21:04 +0000)]
Fix phishing attack in ChooseLockGeneric
am:
56870f438c -s ours
Change-Id: I3f71fa7a65f732de8816b43f02df3cf414e8408b
Steven Ng [Wed, 17 May 2017 21:01:46 +0000 (21:01 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791 am:
e05ef08a8e -s ours
am:
6496c3757b -s ours
Change-Id: I1032e8ad372d0f5cff35e1a1f018ceecedf9bff2
Antony Sargent [Wed, 17 May 2017 19:12:43 +0000 (19:12 +0000)]
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
am:
c439202da9
Change-Id: I2e0eed6c7332a9968b020c69dcc7f5507b355f6e
TreeHugger Robot [Wed, 17 May 2017 18:59:48 +0000 (18:59 +0000)]
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
Matthew Fritze [Wed, 17 May 2017 18:51:14 +0000 (18:51 +0000)]
Merge "Remove duplicates from sound settings" into oc-dev
am:
3abeba07d3
Change-Id: Ief8e333082ef6d8064a51fc54b052e1476880a55
Matthew Fritze [Wed, 17 May 2017 18:50:28 +0000 (18:50 +0000)]
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
am:
4bd0f411ce
Change-Id: I680a407f9955e74b66e5c87af6b8a8d4335c530d
TreeHugger Robot [Wed, 17 May 2017 18:29:53 +0000 (18:29 +0000)]
Merge "Remove duplicates from sound settings" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 18:28:34 +0000 (18:28 +0000)]
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
Kenny Guy [Wed, 17 May 2017 17:43:44 +0000 (17:43 +0000)]
Merge "Disable managed profile version of shortcut picker." into oc-dev
am:
c760135f14
Change-Id: I9df7203ba655e1f483464c0b5cbec14800919ae1
TreeHugger Robot [Wed, 17 May 2017 17:38:29 +0000 (17:38 +0000)]
Merge "Disable managed profile version of shortcut picker." into oc-dev
Matthew Fritze [Wed, 17 May 2017 17:37:51 +0000 (17:37 +0000)]
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
am:
09dbc8043f
Change-Id: Ia172fc4c93b2259ed9a51248159784a89fbdf638
Steven Ng [Wed, 17 May 2017 17:21:44 +0000 (18:21 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
TreeHugger Robot [Wed, 17 May 2017 17:27:56 +0000 (17:27 +0000)]
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
Matthew Fritze [Wed, 17 May 2017 17:26:07 +0000 (17:26 +0000)]
Merge "Remove Legal Information duplicate from Settings search" into oc-dev
am:
915f0cea5b
Change-Id: I508afeb3b832ffc444fa5dafe4836fc0ae202eb0
TreeHugger Robot [Wed, 17 May 2017 17:17:14 +0000 (17:17 +0000)]
Merge "Remove Legal Information duplicate from Settings search" into oc-dev
Matthew Fritze [Wed, 17 May 2017 17:14:24 +0000 (17:14 +0000)]
Merge "Remove default app duplicates in search" into oc-dev
am:
0c55014b88
Change-Id: I62f5fbd444836aa73b6ff801bad944c9a8fddd4b
Matthew Fritze [Wed, 17 May 2017 17:13:46 +0000 (17:13 +0000)]
Merge "Remove Wallpaper duplicate from setting search" into oc-dev
am:
564b965ccc
Change-Id: I955360c67d040a7c05685e8928e54dc6ac1109b6
TreeHugger Robot [Wed, 17 May 2017 17:08:11 +0000 (17:08 +0000)]
Merge "Remove default app duplicates in search" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 17:06:17 +0000 (17:06 +0000)]
Merge "Remove Wallpaper duplicate from setting search" into oc-dev
Kenny Guy [Tue, 16 May 2017 17:54:21 +0000 (18:54 +0100)]
Disable managed profile version of shortcut picker.
Don't show managed profile version of shortcut
picker as it lunaches same activities as personal
one.
Test: manual - check badged shortcut isn't present in launcher.
Bug:
38333213
Change-Id: Iade6595255524a8dbf223a70a6c8312087258c23
Charles He [Wed, 17 May 2017 13:04:40 +0000 (13:04 +0000)]
Merge "Properly remove fingerprints when removing device lock." into oc-dev
am:
98229bdf32
Change-Id: I98ed8a43e4644d709d9cb9ddeb799672a8fb6bc6
Charles He [Wed, 17 May 2017 12:58:15 +0000 (12:58 +0000)]
Merge "Properly remove fingerprints when removing device lock." into oc-dev
Matthew Fritze [Wed, 17 May 2017 04:46:15 +0000 (04:46 +0000)]
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
am:
bcb2565e05
Change-Id: I8a89b5a7676a9fb9961e4275c417a425baa5938e
TreeHugger Robot [Wed, 17 May 2017 04:34:00 +0000 (04:34 +0000)]
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
Matthew Fritze [Wed, 17 May 2017 02:48:24 +0000 (02:48 +0000)]
Revert "Replace dynamic summary text for SettingPref"
This reverts commit
03dfa50996d8365eb600b52999c78fec489cd371.
Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug:
36101902
Fixes:
38352100
Youhan Wang [Wed, 10 May 2017 20:50:28 +0000 (13:50 -0700)]
TelephonyMonitor: Replace boolean decision with multiple status.
Test: make ROBOTEST_FILTER=TelephonyMonitorPreferenceControllerTest
RunSettingsRoboTests -j40
Use enable, disable, user_enable, user_disable four statuses to
replace the old boolean value,
Bug:
36704500
Change-Id: I5d3fd36aecaf36bb6969a6f6354c85bb162a0293
Matthew Fritze [Thu, 11 May 2017 23:35:11 +0000 (16:35 -0700)]
Remove duplicates from sound settings
Duplicates include:
- Do not disturb preferences
- Block Visual Disturbances
- Emergency broadcasts
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I3de430b80fd11d7937d3bec908fbbaa6a176e785
Matthew Fritze [Tue, 16 May 2017 22:44:49 +0000 (22:44 +0000)]
Merge "Remove Special App Access duplicate from Setting search" into oc-dev
am:
d6aa9f3454
Change-Id: I0ae7c3ec171d1954a362c908ea73a8a5741f2554
Matthew Fritze [Thu, 11 May 2017 19:39:32 +0000 (12:39 -0700)]
Remove Backup and Reset duplicates from Settings search
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I3539f9581939255d94ccf04134278414fbe9c72b
Charles He [Thu, 11 May 2017 18:51:46 +0000 (19:51 +0100)]
Properly remove fingerprints when removing device lock.
When strong auth (PIN, password, or pattern) is removed from a user,
fingerprints enrolled for that user should also be removed. Then, if the
user has a work profile guarded by a unified work challenge, the work
profile's fingerprints should also be removed.
Previously, when removing the fingerprints of the current user,
ChooseLockGeneric checked the finger id of the onRemovalSucceeded() and
onRemovalError() callbacks, and assumed the removal had completed when
the id was 0. Only after this would it initiate the removal of work
profile fingerprints, if any.
However, the finger id is actually non-zero even for the user's last
fingerprint. This means the work profile fingerprints (under unified
challenge) were never removed. Another more visible symptom was that
when the user removed the device lock by choosing "None" or "Swipe" in
ChooseLockGeneric, the activity failed to exit, since finish() is called
only at the end of the removal flow which was not executed.
In this CL, we check the number of remaining fingerprints instead of
relying on the finger id, thus allowing the removal flow to complete and
the activity to finish().
Bug:
37938345
Test: manual, both with and without work profile
Test: make SettingsRoboTests
Change-Id: Ic04fd01177ad6d4a061023a4b6889af585f8f2b7
Matthew Fritze [Fri, 12 May 2017 00:15:45 +0000 (17:15 -0700)]
Remove Legal Information duplicate from Settings search
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: Icee65b7a683ad80cd587e22a575b4abc4b009d8f
TreeHugger Robot [Tue, 16 May 2017 22:37:21 +0000 (22:37 +0000)]
Merge "Remove Special App Access duplicate from Setting search" into oc-dev
Steven Ng [Tue, 16 May 2017 21:39:54 +0000 (21:39 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791 am:
e05ef08a8e -s ours am:
6496c3757b -s ours
am:
00266d056c -s ours
Change-Id: Id573a18a0066575ef6aa53bc4b742949eb090461
Steven Ng [Tue, 16 May 2017 21:36:53 +0000 (21:36 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791 am:
e05ef08a8e -s ours
am:
6496c3757b -s ours
Change-Id: I2c58871339e8d2591afe38d58b2ec26b66f917b5
Matthew Fritze [Fri, 12 May 2017 00:57:08 +0000 (17:57 -0700)]
Remove Network Restrictions duplicate from setting search
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I6b1aef6102811a6ad25d2da43993441c6e56006c
Steven Ng [Tue, 16 May 2017 21:33:53 +0000 (21:33 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791
am:
e05ef08a8e -s ours
Change-Id: I19d1bacf055fb660d4ce829222662abfafb9c4a8
Steven Ng [Tue, 16 May 2017 21:33:53 +0000 (21:33 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am:
a2af16bb34 -s ours
am:
dde4d49385 -s ours
Change-Id: I641ab9c828bb088fa551c1d194e3676424ed1f3e
Steven Ng [Tue, 16 May 2017 21:30:54 +0000 (21:30 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
am:
a2af16bb34 -s ours
Change-Id: Ia126d3684bea6fdf19c58bc98324b019265af859
Steven Ng [Tue, 16 May 2017 21:30:54 +0000 (21:30 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
am:
c07f39c791
Change-Id: I00f92abcf2acd828ab8e81ed0053f7afd9f0d994
Steven Ng [Tue, 16 May 2017 21:18:12 +0000 (21:18 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
Steven Ng [Tue, 16 May 2017 21:17:58 +0000 (21:17 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
Bill Yi [Tue, 16 May 2017 18:51:10 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
e11a4d4e86 -s ours
Change-Id: I9e6981e64124043f872a0dd6b6679cd4b0021bf5
TreeHugger Robot [Tue, 16 May 2017 18:29:39 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Antony Sargent [Thu, 20 Apr 2017 19:35:32 +0000 (12:35 -0700)]
Add a "Use high quality audio" option to Bluetooth A2DP device settings
This change adds a checkbox reading "Use high quality audio: <codec
name>" to the details dialog for A2DP audio bluetooth devices that
support codecs other than the mandatory SBC (eg AAC, LDAC, aptX, etc.).
Bug:
37441685
Test: make RunSettingsRoboTests
Change-Id: I6e5423db11a0cd7fe0b1141dd998e7c936c240f0
Daniel Nishi [Tue, 16 May 2017 17:07:34 +0000 (17:07 +0000)]
Merge "Fix a bug where storage settings flickers." into oc-dev
am:
1da7123930
Change-Id: I1cfe2b00a37e26d0e4f7c6806fadb601c5fdb617
Daniel Nishi [Tue, 16 May 2017 17:01:29 +0000 (17:01 +0000)]
Merge "Fix a bug where storage settings flickers." into oc-dev
Shinji Sogo [Tue, 16 May 2017 15:33:36 +0000 (15:33 +0000)]
Merge "Show security info in saved network list" into oc-dev
am:
ecd1df1076
Change-Id: I068abbefd82c0447e474d6db6c38a56ea4703217
TreeHugger Robot [Tue, 16 May 2017 15:25:52 +0000 (15:25 +0000)]
Merge "Show security info in saved network list" into oc-dev
Bill Yi [Tue, 16 May 2017 08:42:58 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia166bd3b3e8acd794f43e415b15edbb579c54573
Auto-generated-cl: translation import
Matthew Fritze [Tue, 16 May 2017 00:12:07 +0000 (00:12 +0000)]
Merge "Replace dynamic summary text for SettingPref" into oc-dev
am:
49b86b5c6a
Change-Id: Icb21526f03242d310824d20a21c82bd2f76893f2
TreeHugger Robot [Mon, 15 May 2017 23:46:17 +0000 (23:46 +0000)]
Merge "Replace dynamic summary text for SettingPref" into oc-dev
Steven Ng [Mon, 15 May 2017 17:30:04 +0000 (18:30 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Steven Ng [Thu, 11 May 2017 17:31:08 +0000 (18:31 +0100)]
Fix phishing attack in ChooseLockGeneric
Cherry-pick of
436256c36d69549c77320d073bef27649c1b1d6e
Test: 1) make and run SettingsTests. It passes.
2) Manual test 1
a) On a device supports fingerprint, set a password but not fingerprint.
b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
c) Confirm Lock password screen is shown
d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
e) A new password can be set successfully.
3) Manual test 2
a) Repeat step 2)a) - 2)c)
b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
c) A new password and fingerprint can be enrolled successfully.
Bug:
33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Bill Yi [Sat, 13 May 2017 06:51:12 +0000 (06:51 +0000)]
Import translations. DO NOT MERGE
am:
3b2d98c714 -s ours
Change-Id: I425cc59dacedac1c97d92e700ad1e0e93bd0a089
Bill Yi [Sat, 13 May 2017 00:11:09 +0000 (17:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2906d6bf999dccdec191f285f73e04fe52f4c2a4
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 12 May 2017 22:22:15 +0000 (22:22 +0000)]
Merge "Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c am:
611fda4a97 -s ours am:
1c3120f196" into oc-dev-plus-aosp
Phil Weaver [Fri, 12 May 2017 22:21:56 +0000 (22:21 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c am:
611fda4a97
am:
8f58e8b6e9 -s ours
Change-Id: Ib9fcc7305964fc16152ed86d16d42b48113b5c0d
Phil Weaver [Fri, 12 May 2017 22:21:56 +0000 (22:21 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c am:
611fda4a97 -s ours
am:
1c3120f196
Change-Id: I990f591be5bc0f596c910037e362ecee84c9ed9b
Phil Weaver [Fri, 12 May 2017 22:19:53 +0000 (22:19 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c
am:
611fda4a97 -s ours
Change-Id: I1e12d774e57528af8f263e36d64af95e9d5c23b0
Phil Weaver [Fri, 12 May 2017 22:17:54 +0000 (22:17 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239 am:
7f1bc85e4c
am:
611fda4a97
Change-Id: I5dfd4f444b4d13c139d8119f0e879fe71de20ad2
Phil Weaver [Fri, 12 May 2017 22:16:26 +0000 (22:16 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a am:
8247008239
am:
7f1bc85e4c
Change-Id: I3f92db015ad60b8e6257a71153a58a7883c1cac7
Phil Weaver [Fri, 12 May 2017 22:14:22 +0000 (22:14 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60 am:
9b8abd652a
am:
8247008239
Change-Id: Ieea167c11711139aff52c72c515b919240d7eb1a
Phil Weaver [Fri, 12 May 2017 22:11:56 +0000 (22:11 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4 am:
adf8f8bc60
am:
9b8abd652a
Change-Id: I1eec44668bbd578003d3cc57763808ec2a80f0fa
Phil Weaver [Fri, 12 May 2017 22:08:53 +0000 (22:08 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67 am:
11b6279ed4
am:
adf8f8bc60
Change-Id: Id26b90f8d4afbf6e50bc8e43afced432c70dba68
Phil Weaver [Fri, 12 May 2017 22:07:24 +0000 (22:07 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e am:
beb7f31d67
am:
11b6279ed4
Change-Id: I370c3f0ffc78f86b465d9721a753503b03d56d54
Doris Ling [Fri, 12 May 2017 22:06:32 +0000 (22:06 +0000)]
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
am:
d821a32b8e
Change-Id: If0208dec8535fe72b14f73f42eb56ecfd7c9d2f7
Phil Weaver [Fri, 12 May 2017 22:05:52 +0000 (22:05 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e
am:
beb7f31d67
Change-Id: I13dc112b756569d68bddad1716db0e3979d0c150
Phil Weaver [Fri, 12 May 2017 22:02:53 +0000 (22:02 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f
am:
5d6d70a50e
Change-Id: Ib4fca899498f1348263beff3908c24a9ec65c392
Phil Weaver [Fri, 12 May 2017 22:00:23 +0000 (22:00 +0000)]
Don't enable a11y service if scary dialog obscured
am:
9a1b4eb21f
Change-Id: I0a288cb9cef29d730ec82028cf0dc003970db734
TreeHugger Robot [Fri, 12 May 2017 21:54:21 +0000 (21:54 +0000)]
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
Fan Zhang [Fri, 12 May 2017 20:42:53 +0000 (20:42 +0000)]
Merge "Add a no-op activity to handle development setting intent." into oc-dev
am:
0036ef2cf0
Change-Id: I116509d6ee62fd0633729f832cf88e4e9d9c6708
TreeHugger Robot [Fri, 12 May 2017 20:16:19 +0000 (20:16 +0000)]
Merge "Add a no-op activity to handle development setting intent." into oc-dev
Matthew Fritze [Thu, 11 May 2017 20:32:37 +0000 (13:32 -0700)]
Remove Wallpaper duplicate from setting search
Bug:
33701673
Test: make -j40 RunSettingsRoboTests
Change-Id: I520cbc74284d92ab05b733346ee1b3115ddd8e9f
Sudheer Shanka [Fri, 12 May 2017 18:09:55 +0000 (18:09 +0000)]
Merge "Update FakeUid to include new methods." into oc-dev
am:
129369e58e
Change-Id: I0f6ac2bd7ba43d31843c61b0478cfd39fb20da0d
Sudheer Shanka [Fri, 12 May 2017 18:02:36 +0000 (18:02 +0000)]
Merge "Update FakeUid to include new methods." into oc-dev
Shinji Sogo [Sat, 6 May 2017 09:33:41 +0000 (18:33 +0900)]
Show security info in saved network list
When an access point linked to a saved network is not found,
security info should be shown in dialog of saved network.
Notes that in Android N this list is created with saved networks
and scan result, and that causes security info is not shown for
access points seen around user, but in Android O only saved
networks are used to create a list. That means security info is
shown for all access points listed in the screen.
Bug:
38102896
Test: make RunSettingsRoboTests
Change-Id: Ia0c5184ae7a1325f2628f4c08e29350c5793a08f
(cherry-pick of
a8382c11f58ecbfbc5b8d908b97c53d59cf774fe)
Doris Ling [Fri, 28 Apr 2017 22:17:30 +0000 (15:17 -0700)]
Change AppPrefLoader from AsyncTask to AsyncLoader.
Showing the wifi data usage results in reaching the max number of
threads in the pool executor. Switching the loader implementation
from Async task to AsynLoader and use a single loader to get the
whole list of preferences instead of using a new task to create each
list element.
Change-Id: I0da19ca09031a7fa178970c192e12a99ab489145
Fix:
33820327
Test: make RunSettingsRoboTests
Daniel Nishi [Mon, 8 May 2017 16:58:16 +0000 (09:58 -0700)]
Fix a bug where storage settings flickers.
The bug resulted from the fact that turning off loading while loading is
turned off causes the loading finishing animation to flicker. By only
turning it off when it is on, we ensure it works.
Change-Id: Ia31bf3e9aa90726e39b6bc7189d175c38fb51e5a
Fixes:
38045492
Test: Manual
Julia Reynolds [Fri, 12 May 2017 12:20:36 +0000 (12:20 +0000)]
Merge "Notification settings, importance and pre-O apps" into oc-dev
am:
6393e1752f
Change-Id: Ibb9015ad5a77d18a41997712d969ab7bc68f7fad
Julia Reynolds [Fri, 12 May 2017 12:14:07 +0000 (12:14 +0000)]
Merge "Notification settings, importance and pre-O apps" into oc-dev
Amin Shaikh [Fri, 12 May 2017 06:48:13 +0000 (06:48 +0000)]
Merge changes from topic 'onarevert' into oc-dev
am:
b747be0769
Change-Id: Ia3b7fbe98a5ffc125ffa9e1ebdc677076814be7c
Amin Shaikh [Fri, 12 May 2017 06:48:04 +0000 (06:48 +0000)]
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
am:
dfa9bb8914
Change-Id: I7e651b05a13d9c9149149d4161da440a9a0f31d6
Matthew Fritze [Fri, 12 May 2017 06:46:32 +0000 (06:46 +0000)]
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
am:
b38c1e5353
Change-Id: Ia8323363dabd6937a33c6b53ea6755c904e776d4
Chris Wren [Fri, 12 May 2017 05:57:49 +0000 (05:57 +0000)]
Merge "add a global control for badging" into oc-dev
am:
1425b91bac
Change-Id: Iaf8eb302360f077b1629a170675ebc3f5e794fa6
jackqdyulei [Fri, 12 May 2017 04:58:12 +0000 (04:58 +0000)]
Merge "Add animation for battery asyncLoader." into oc-dev
am:
6c680a36c5
Change-Id: I7a04ed25dd48fdb9f3837f03c93dc4818aaadfde
Doris Ling [Fri, 12 May 2017 04:57:40 +0000 (04:57 +0000)]
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
am:
d3e33ebcef
Change-Id: Idc21289911d064e676f86bae72bdc188eb07f260
Chris Wren [Fri, 12 May 2017 04:57:08 +0000 (04:57 +0000)]
Merge "allow secondary users to use notification settings" into oc-dev
am:
72cc7b7915
Change-Id: I0ea930f20fec81b5f2ada8a74f65c68375de8c55
TreeHugger Robot [Fri, 12 May 2017 04:40:21 +0000 (04:40 +0000)]
Merge changes from topic 'onarevert' into oc-dev
* changes:
Update "Open networks available" setting.
Revert "Update "Open networks available" toggle to instead open notification channel preferences."