OSDN Git Service
Fan Zhang [Thu, 18 May 2017 01:14:10 +0000 (01:14 +0000)]
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev am:
2b030aeb65
am:
60d26cfffa
Change-Id: I878bafe5a626e2f6fe9d8f4cfbb89dfeb763c7a0
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:09:16 +0000 (01:09 +0000)]
Merge "Fix robolectric test failure" into oc-dev am:
2545bcaa74
am:
3970916cf1
Change-Id: I7f63f5cee9a91c8f88711a0ada04a24a676692f1
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:46:20 +0000 (23:46 +0000)]
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev am:
350ba4a4c3
am:
c6b1845d0f
Change-Id: I3bee5b3a1e90a7f8766b875045a54a9945264226
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:54:57 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp am:
3b76c25cee -s ours
am:
268be8edde
Change-Id: Idd556e4ec777eb2ec4c52c6df28f16a64435ca9c
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
Lei Yu [Wed, 17 May 2017 21:10:27 +0000 (21:10 +0000)]
Merge "Add AnomalyDetectionPolicy"
Steven Ng [Wed, 17 May 2017 21:07:45 +0000 (21:07 +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
am:
be7621e1d7 -s ours
Change-Id: I8232b0ee829d7c46dacd066a746fb8055a5e3818
Steven Ng [Wed, 17 May 2017 21:07:09 +0000 (21:07 +0000)]
Fix phishing attack in ChooseLockGeneric am:
56870f438c -s ours
am:
b0ad380d0c -s ours
Change-Id: I466c5cd87ac090793e44f1270a2bb1f6e7a4d611
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:41:16 +0000 (19:41 +0000)]
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev am:
c439202da9
am:
3afb6616c6
Change-Id: I37280e12b32047ddef316be763f69b5ff648b557
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
Matthew Fritze [Wed, 17 May 2017 19:07:45 +0000 (19:07 +0000)]
Merge "Remove duplicates from sound settings" into oc-dev am:
3abeba07d3
am:
a939959838
Change-Id: I0260cf2a7dd9d54b700387d0d82f58a7c6a3263c
Matthew Fritze [Wed, 17 May 2017 19:06:59 +0000 (19:06 +0000)]
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am:
4bd0f411ce
am:
af054e63e0
Change-Id: I35667061a61fd66e8ab8acafccffb53f00f15149
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:53:40 +0000 (17:53 +0000)]
Merge "Disable managed profile version of shortcut picker." into oc-dev am:
c760135f14
am:
020dd7b169
Change-Id: I8acfa1dd9e19cf7ad31cadae047cf44f6d88dcc8
Matthew Fritze [Wed, 17 May 2017 17:53:08 +0000 (17:53 +0000)]
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev am:
09dbc8043f
am:
d53409356d
Change-Id: Ia40375afa74f82a46c01aef99b95d6074fbc5324
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
Matthew Fritze [Wed, 17 May 2017 17:31:08 +0000 (17:31 +0000)]
Merge "Remove Legal Information duplicate from Settings search" into oc-dev am:
915f0cea5b
am:
70db53a8d5
Change-Id: I03de10d23f3d9a74ee08fdb6a711400e3e0468cf
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
Matthew Fritze [Wed, 17 May 2017 17:17:37 +0000 (17:17 +0000)]
Merge "Remove default app duplicates in search" into oc-dev am:
0c55014b88
am:
79cfaa7b91
Change-Id: I1beb3569054d6acbcd9f22d112031de51b862dc9
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:16:47 +0000 (17:16 +0000)]
Merge "Remove Wallpaper duplicate from setting search" into oc-dev am:
564b965ccc
am:
5a151d23ab
Change-Id: If022852ca522b4d3f2fc8a01a9e96b966ab98cfa
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:12:00 +0000 (13:12 +0000)]
Merge "Properly remove fingerprints when removing device lock." into oc-dev am:
98229bdf32
am:
af36129ae9
Change-Id: Iffc4f16ac3301bc0fbe9b4d8a1c88b3e71ce2373
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:48:50 +0000 (04:48 +0000)]
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev am:
bcb2565e05
am:
f8b8ecebea
Change-Id: I4ae1d981c928e1b61d555d129723b7dabafd439c
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
TreeHugger Robot [Wed, 17 May 2017 01:24:31 +0000 (01:24 +0000)]
Merge "Do not close cursor in onLoadFinished"
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:53:37 +0000 (22:53 +0000)]
Merge "Remove Special App Access duplicate from Setting search" into oc-dev am:
d6aa9f3454
am:
c6192251b2
Change-Id: Ia442b29148675a291aca2b317c398bf285b3a2eb
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:38:06 +0000 (22:38 +0000)]
Merge "Add SupportDashboardActivity to secondary user home AI"
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:43:48 +0000 (21:43 +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
am:
17bb961066 -s ours
Change-Id: I650ce37d934f2ca30f5d5bd3122593f0c4553b50
Steven Ng [Tue, 16 May 2017 21:43:13 +0000 (21:43 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am:
a2af16bb34 -s ours am:
dde4d49385 -s ours
am:
25e02bc80c -s ours
Change-Id: I877a362643f92257fe2d741e4a2c9db3606f15d0
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
Christine Franks [Tue, 16 May 2017 21:23:19 +0000 (21:23 +0000)]
Merge "Fix switch widget in night display preference"
TreeHugger Robot [Tue, 16 May 2017 21:20:46 +0000 (21:20 +0000)]
Merge "Add title to SeekbarPreference content description."
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
Fan Zhang [Tue, 16 May 2017 20:51:36 +0000 (20:51 +0000)]
Revert "Update strings in special app access and dev options"
This reverts commit
9834bd82da89cd777aaa5005760f90b95f0b292d.
Fix:
38347840
Test: make RunSettingsRoboTests
Change-Id: Ia366db7d9779c14a1b8cbe86e509bc54c9eee658
jackqdyulei [Thu, 11 May 2017 22:12:13 +0000 (15:12 -0700)]
Add AnomalyDetectionPolicy
AnomalyDetectionPolicy contains all the knobs for anomaly detection.
Since Robolectric doesn't support KeyValueListParser, this cl creates
KeyValueListParserWrapper so we could mock it and test
AnomalyDetectionPolicy
Bug:
36924669
Test: RunSettingsRoboTests
Change-Id: I71138f85d37a21b5c4c9c806a41e00a4aa924f5f
Fan Zhang [Tue, 16 May 2017 17:50:59 +0000 (10:50 -0700)]
Add title to SeekbarPreference content description.
Adding a title to contentDesciption of the seekbar.
The title is helpful to indicate which seekbar user is changing when
talkback is enabled.
Also move SeekBarPreference from root package to widget packge.
Change-Id: I793f41c4902e350b6bc6d62761362779cc3722a9
Fix:
35421942
Test: make RunSettingsRoboTests
Bill Yi [Tue, 16 May 2017 19:34:36 +0000 (19:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
e11a4d4e86 -s ours
am:
d3dbc35ba7 -s ours
Change-Id: I63050052671d3ac376028a04539811c164508c26
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
Saige McVea [Tue, 16 May 2017 18:32:29 +0000 (18:32 +0000)]
Merge "Update a11y icon in Setting."
TreeHugger Robot [Tue, 16 May 2017 18:29:39 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 16 May 2017 18:29:29 +0000 (18:29 +0000)]
Merge "Import translations. DO NOT MERGE"
Salvador Martinez [Tue, 9 May 2017 23:53:55 +0000 (16:53 -0700)]
Add SupportDashboardActivity to secondary user home AI
Secondary users could not see the support preference in the
settings home screen because it was missing from the list of
whitelisted activities. This CL adds the SupportDashboardActivity
to the list so that secondary users can see it.
Test: Robotests still pass for SettingsGateway
Change-Id: Ia48dbd5b8d396c1bdf050c102fee0a5cd5300ed2
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
Salvador Martinez [Thu, 11 May 2017 00:49:51 +0000 (17:49 -0700)]
Do not close cursor in onLoadFinished
Apparently in cursor loaders you don't need to manually close
the cursor because it does it for you at the end. doing so can
also cause crashes on device configuration changes since it
will call the method again with the same cursor.
Test: robotests still pass
Bug:
38208727
Change-Id: I285e56546daf726e74b903856b17dc034d6fd538
Daniel Nishi [Tue, 16 May 2017 17:14:02 +0000 (17:14 +0000)]
Merge "Fix a bug where storage settings flickers." into oc-dev am:
1da7123930
am:
90c963b1fa
Change-Id: I46fa3abdf3843b442b5ff484e74ae91d41eb68bd
Christine Franks [Tue, 16 May 2017 17:12:23 +0000 (10:12 -0700)]
Fix switch widget in night display preference
Bug:
38314992
Test: manual - visual inspection
Change-Id: I010d6be0eb53fffa07ffdbb771125f5aeff20727
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:39:57 +0000 (15:39 +0000)]
Merge "Show security info in saved network list" into oc-dev am:
ecd1df1076
am:
183aed6dd6
Change-Id: Ib479ee98d5c6500954e5dede317f46c19bc2aca6
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
Bill Yi [Tue, 16 May 2017 08:30:19 +0000 (01:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I52f32704074371cac217c05bbb734c2bb8a601e9
Auto-generated-cl: translation import
Maurice Lam [Tue, 16 May 2017 02:08:52 +0000 (02:08 +0000)]
Merge "Make lock pattern more usable on small screens"
Matthew Fritze [Tue, 16 May 2017 01:56:55 +0000 (01:56 +0000)]
Merge "Replace dynamic summary text for SettingPref" into oc-dev am:
49b86b5c6a
am:
1f21e7f325
Change-Id: Ie231837dc4ae0f4f94f326f67c06dfc2eb79ce4e
TreeHugger Robot [Tue, 16 May 2017 00:43:07 +0000 (00:43 +0000)]
Merge "Fix vpn config dialog text alignment in RTL locales"
OSDN Git Service
