tim peng
e5deddbe47
Merge changes from topic "update_entry"
...
* changes:
Update rule of launching media output dialog
Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
2020-10-12 01:03:27 +00:00
Hall Liu
cd83e053de
Merge "Replace TelephonyManager methods for mobile data" am: 9d39cc3d63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12700389
Change-Id: I5b985f01d40f044d019c500f674a0c17ddc65e21
2020-10-09 17:10:24 +00:00
Jiashen Wang
f5a9cc2f03
Merge "[SIM Dialog Migration] Migrate eSIM erase dialog" am: 6265cf8e6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12750116
Change-Id: Ic49f018c26eb61708036e0fb936acec35182d713
2020-10-09 17:09:50 +00:00
Hall Liu
9d39cc3d63
Merge "Replace TelephonyManager methods for mobile data"
2020-10-09 17:03:16 +00:00
Jiashen Wang
6265cf8e6c
Merge "[SIM Dialog Migration] Migrate eSIM erase dialog"
2020-10-09 16:38:58 +00:00
Bill Yi
b23a9efaf1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de21809c01
-s ours am: 32105e95d1
-s ours am: b094391c1e
-s ours am: 17eed892cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12799313
Change-Id: Ie5429745aaaf3ff9415e41789dc00c96f8af35d4
2020-10-09 14:53:14 +00:00
Bill Yi
17eed892cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de21809c01
-s ours am: 32105e95d1
-s ours am: b094391c1e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12799313
Change-Id: Ibe5d769356cdac155cd4e9fe27fc3d906f02ee9d
2020-10-09 14:37:46 +00:00
Bill Yi
d7e4b6368d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b4bb4554f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12797924
Change-Id: I6588f3111877362bf59c09a488f6700a1b5da978
2020-10-09 14:09:02 +00:00
Bill Yi
b094391c1e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de21809c01
-s ours am: 32105e95d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12799313
Change-Id: I9cf8504ce4b8ae2347f9c877d5855a99908af577
2020-10-09 13:52:30 +00:00
Bill Yi
32105e95d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de21809c01
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12799313
Change-Id: I17ae8fd63ae635042a95f0bd6bf44e0fda74c426
2020-10-09 13:32:50 +00:00
Xin Li
8656492241
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
Change-Id: I0411c2f1dbc2fa47b23ff52cacca990f3141f52f
2020-10-08 23:40:50 -07:00
Jiashen Wang
ff311a2107
[SIM Dialog Migration] Migrate eSIM erase dialog
...
Bug: 160819390
Test: Manually tested eSIM profile disabling.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Change-Id: I9523ee5dbab5b6a5ea020647a20992ac0b1aea86
2020-10-08 22:31:53 -07:00
Sarah Chin
f3d7860c70
Hide 'View plan' button in data usage settings
...
There are currently no callers of the setSubscriptionPlan() API that
have a MDP app set up. Remove the button when SubscriptionPlans are
defined, since it does nothing and causes confusion for users.
Test: manually verify button does not exist when a plan is defined
Test: make RunSettingsRoboTests
Bug: 169806315
Change-Id: Ieda020bfa692e9465d6297e50cf338deff91a8a9
2020-10-08 21:03:39 -07:00
Bill Yi
de21809c01
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4b4ef8198075875b40875e95144cb7d130f10a70
2020-10-08 20:51:34 -07:00
Bill Yi
2b4bb4554f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1bc10c0ca6fc4f6b21da0a5384182d973404da02
2020-10-09 03:01:53 +00:00
Hall Liu
d67a1c3d8e
Replace TelephonyManager methods for mobile data
...
TelephonyManager had a minor refactor of some of the methods revolving
around mobile data. Change code in Settings to use the new ones instead.
Bug: 169367013
Test: existing unit tests, manual
Change-Id: I7ebae37373d53fb2c59b6b546232dbddf77398d4
2020-10-08 19:37:57 -07:00
jasonwshsu
48b546eccf
Extract UserShortcutType functions from ToggleFeaturePreferenceFragment
...
* Simplify StringJoiner to '+' since it only have one case
* Simplify Collections usage to use removeIf() and findFirst() directly
* Change class name SharedPreferenceUtils to PreferredShortcuts
Bug: 158540780
Test: atest ToggleFeaturePreferenceFragmentTest
Test: atest PreferredShortcutsTest
Change-Id: I02f03ccba09b6d7edaa5c0c8223ab3561a5e976b
2020-10-09 00:34:04 +00:00
Andrei Onea
f21ba0c650
Add support for @EnabledSince compat changes
...
Bug: 49103556
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Change-Id: Iaf83b1ef2f07a910a3590f59562c2f638b5a6089
2020-10-08 21:54:02 +01:00
Neil Fuller
35991fa37a
Adjust wording for auto time / time zone detection
...
Adjust wording for auto time / time zone detection settings.
Test: build / boot / inspect only
Bug: 152746236
Change-Id: Ic69c55dc7589056889abc3896f966738f0aa5bb3
2020-10-08 21:16:10 +01:00
Jiashen Wang
0b3f266d19
Merge "[SIM Dialog Migration] Add SIM dialogs to support screen rotation" am: 831172e9a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12750115
Change-Id: I0185fcae6d03bedc27dde544bdaf586f0bbf05df
2020-10-08 18:00:08 +00:00
Jiashen Wang
831172e9a8
Merge "[SIM Dialog Migration] Add SIM dialogs to support screen rotation"
2020-10-08 17:46:03 +00:00
jasonwshsu
26f1b5f65c
Add data class PreferredShortcut to replace inner class UserShortcutType
...
* Add basic function equals(), hashcode() into data class
* Change flatternToString() to toString()
* Change constructor to fromString(flatternToString)
Bug: 158540780
Test: atest PreferredShortcutTest
Change-Id: I0ee46dd940d22ff9f168b95fe75d9cff2f0fddfb
2020-10-08 10:53:48 +00:00
timhypeng
eee759ea29
Update rule of launching media output dialog
...
-Do not hide Media Output Dialog in Settings, and let dialog handles
-Hide Media output slice panel when launching dialog
Bug: 155822415
Test: make -j50 RunSettingsRoboTests
Change-Id: I16732f625f100b259d6e53c85db40af0ec1652c5
2020-10-08 16:29:28 +08:00
timhypeng
3084d063f3
Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
...
-Update entry point at media indicator in volume panel
-Update entry point at remote media slice in volume panel
-Update entry point at remote volume group in Sound Settings
-Update entry point at media output preference in Sound Settings
-Hide Media output dialog when the caller is not active
Bug: 155822415
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib6c86067522925c439f336644e4d027dbae3379c
2020-10-08 16:18:43 +08:00
timhypeng
1268629fda
Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController
...
-Caused by removing and adding preference at the same time
-Make preference operation method synchronized
-Not to update preference by removing and adding. To check session status and update its content to preference
-Post to UI thread to handle the onDeviceListUpdate() callback from framework
Bug: 170049403
Test: make -j50 RunSettingsRoboTests
Change-Id: Ibfc11e1bd99ba2e578b5d9e7dcc9132e372b68dd
2020-10-08 07:43:46 +00:00
Arc Wang
352d1e8e53
Merge "[Settings] Remove failure JUnit test cases" am: ca40e8d31c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771901
Change-Id: I17c1173e6999d72691c3db0695b8811a4ce890f5
2020-10-08 07:12:58 +00:00
Arc Wang
ca40e8d31c
Merge "[Settings] Remove failure JUnit test cases"
2020-10-08 06:57:35 +00:00
TreeHugger Robot
6c4ce6f8aa
Merge "Add randomized MAC (last used)" am: 5446e7a7c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12769319
Change-Id: Ibc63e72fcb303fb462c2089469721c19c0523a93
2020-10-08 04:10:31 +00:00
TreeHugger Robot
5446e7a7c4
Merge "Add randomized MAC (last used)"
2020-10-08 03:42:00 +00:00
TreeHugger Robot
fa0076c7c6
Merge "Revert "Add the FLAG_IMMUTABLE flag for creating a PendingIntent"" am: 2e307f804a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12784439
Change-Id: Ie812e9db3b5e7f63979276bba15e274fe43bea9c
2020-10-08 02:13:34 +00:00
TreeHugger Robot
2e307f804a
Merge "Revert "Add the FLAG_IMMUTABLE flag for creating a PendingIntent""
2020-10-08 01:42:50 +00:00
xshu
19eabbff63
Add randomized MAC (last used)
...
Makes it clear that when a network is disconnected, the randomized MAC
address shown is the last used one. (ie. it could change in the next
connection depending on whether enhanced MAC randomization is active)
Bug: 170166681
Test: Manually verified that the new text is shown for disconnected
networks.
Change-Id: I4aec47b2de68c077e6fdc7efa96d39e6666d4c86
2020-10-07 14:20:16 -07:00
TreeHugger Robot
757bf244ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0313f1328
-s ours am: ad20bb4875
-s ours am: 6884db1c4f
-s ours am: af667e87c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12779297
Change-Id: I090d332b9eae5982f996db0be0ef8ed4ae05cbbf
2020-10-07 19:15:59 +00:00
TreeHugger Robot
3a513ed985
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d0147558bb
-s ours am: 7e1d22baf9
-s ours am: c70687517a
-s ours am: d774d729cd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12782680
Change-Id: I4f4022803119294c2b087c278ea51c9ba8506374
2020-10-07 19:15:45 +00:00
TreeHugger Robot
af667e87c3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0313f1328
-s ours am: ad20bb4875
-s ours am: 6884db1c4f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12779297
Change-Id: Ia191268ed2423cca8410769ceef111d6883d15d4
2020-10-07 18:48:46 +00:00
TreeHugger Robot
d774d729cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d0147558bb
-s ours am: 7e1d22baf9
-s ours am: c70687517a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12782680
Change-Id: I819e2f8fa12ca2c07eaec9cf02f23d5ff8f27d0e
2020-10-07 18:48:20 +00:00
TreeHugger Robot
6884db1c4f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0313f1328
-s ours am: ad20bb4875
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12779297
Change-Id: I5d4f16f1ac17690f33d46e58bd994018c6a37635
2020-10-07 18:34:26 +00:00
TreeHugger Robot
c70687517a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d0147558bb
-s ours am: 7e1d22baf9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12782680
Change-Id: I4f96a36f90c43421b6d670dc236a46779c79f142
2020-10-07 18:34:13 +00:00
TreeHugger Robot
ad20bb4875
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0313f1328
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12779297
Change-Id: Iba3addc036b56f1a5ab431368e3f1dac952897ef
2020-10-07 18:19:37 +00:00
TreeHugger Robot
7e1d22baf9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d0147558bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12782680
Change-Id: Ibceea2a0db7cd86d1060c3035d1306127e921ebf
2020-10-07 18:19:00 +00:00
TreeHugger Robot
f0313f1328
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-10-07 18:03:32 +00:00
TreeHugger Robot
d0147558bb
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-10-07 17:49:45 +00:00
Daniel Chapin
ee1360f13c
Revert "Add the FLAG_IMMUTABLE flag for creating a PendingIntent"
...
This reverts commit 334968c113
.
Reason for revert: Bug: 170280415
Change-Id: Idaa269406d6c1609c75f0dfba1f7fa9daf979101
2020-10-07 17:47:36 +00:00
Bill Yi
4c00a7338e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I194219f78cffa0b5e0c6e3230158dd700a7fc31a
2020-10-07 07:10:55 -07:00
Arc Wang
63e015962c
[Settings] Remove failure JUnit test cases
...
This change removes all the files which have any failure JUnit test case.
Bug: 168429329
Test: atest --test-mapping tests/unit:postsubmit
Change-Id: I1665565760f9dfc185bf9b8dd871ee106eba5dd5
2020-10-07 21:26:09 +08:00
Bill Yi
d387c33f9a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iffd874c0f7449ca10692e382178347b5c9db8088
2020-10-07 06:24:54 -07:00
TreeHugger Robot
cfa667bb95
Merge "Preliminary classification for homepage IA grouping" am: 351821e688
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771755
Change-Id: I33d1e46bd4d9a5e39056a906ab1fffbf9390531d
2020-10-07 11:52:53 +00:00
TreeHugger Robot
351821e688
Merge "Preliminary classification for homepage IA grouping"
2020-10-07 11:40:13 +00:00
Jason Chiu
e4b2b77452
Reduce the flickering of injected items when package is changed
...
Root cause:
Settings listens to four package-related broadcasts in order to refresh
injected items because UI data may change. However, when the system is
updating apps on the first boot, it triggers a burst of broadcasts. For
each broadcast Settings will reload and then redraw all injected items,
which leads to the flickering.
Solution:
1. When Settings recieves a broadcast, check if there are already two
reloading tasks to avoid redundant updates.
2. In the reloading task, check if any injected item is changed, added,
or removed to notify categories changed.
3. Only refresh the UI when any of the changed items belongs to the
current page.
Bug: 166785977
Bug: 168309941
Test: manual, robotest
Change-Id: I77745b60f84510554bff1870a5bb7a8013eab528
Merged-In: I77745b60f84510554bff1870a5bb7a8013eab528
(cherry picked from commit 20df25e6b9
)
2020-10-07 17:49:17 +08:00
TreeHugger Robot
59c9d42963
Merge "Implement advanced device battery prediction" am: 2489494cd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12555477
Change-Id: Ia51f957c068f8009ad0a795b35228896edc03ed3
2020-10-07 07:46:34 +00:00