PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,158 Commits 1 Branch 0 Tags
e16a8077b542fdbb54fa30ed18c96948ebb0f42a
Commit Graph

75158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugh Chen
e16a8077b5 Fix output switcher will show 2 media session when remote playing 
Before this CL, output switcher will show 2 media sessions when
some apps are remote playing. The root cause is some apps will
also create local media sessions when they cast media to remote
playing.

This CL add condition to only show remote sessions on output switcher
if apps both have remote and local sessions.

Bug: 169052790
Test: make -j42 RunSettingsRoboTests
Change-Id: I80479d35b2bb2e353cf41f41f457f2dfd15cadbf
 2020-10-14 17:58:47 +08:00
Yi Jiang
79dc82fb6f Merge "Merge Screen Attention and Screen timeout Settings." 2020-10-14 05:07:40 +00:00
TreeHugger Robot
2228c642b8 Merge "Fix crash on "Connection preferences"" 2020-10-14 03:36:43 +00:00
Yi Jiang
f5d1841c9d Merge Screen Attention and Screen timeout Settings. 
Bug: 155051311
Test: atest
Change-Id: I6f6ee52618eab629a41b28982be32ead5f9ba08d
 2020-10-13 00:47:13 -07:00
TreeHugger Robot
6208cbfd9d [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 4cee165533 -s ours am: e161ec59dc -s ours am: adf313878a -s ours 
am skip reason: Change-Id I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d with SHA-1 064ba89fc3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12803341

Change-Id: I2a4a345f08f2b3423bbb9f1d9b0de95e0a994bfb
 2020-10-13 04:50:31 +00:00
TreeHugger Robot
adf313878a [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 4cee165533 -s ours am: e161ec59dc -s ours 
am skip reason: Change-Id I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d with SHA-1 064ba89fc3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12803341

Change-Id: I9c972593f7cdef6eb900fe6c0fd517685e7b0869
 2020-10-13 04:22:40 +00:00
TreeHugger Robot
e161ec59dc [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 4cee165533 -s ours 
am skip reason: Change-Id I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d with SHA-1 064ba89fc3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12803341

Change-Id: I74fc436ded08114312544556de5293486fc94442
 2020-10-13 03:51:01 +00:00
TreeHugger Robot
4cee165533 Merge "Merge ab/6749736 in stage." into stage-aosp-master 2020-10-13 03:31:33 +00:00
TreeHugger Robot
38e8565b6e Merge "Hide the contextual home architecture." 2020-10-13 01:54:55 +00:00
Yi-Ling Chuang
985825edbf Hide the contextual home architecture. 
The contextual home will default to being disabled in Android S.
Changing the feature flag could reenable it.

Fixes: 168179764
Test: launch Settings and don't see contextual cards
Change-Id: I9591b50c4fe882c8605a71490f56aef4156b3e80
 2020-10-12 19:17:05 +08:00
Hugh Chen
84fe29ae79 Fix crash on "Connection preferences" 
This CL adds a null check condition to avoid crash for
some device not support PrintManager.

Bug: 159848003
Test: make -j42 SettingsGoogle
Change-Id: Ic6c4c17bb563458f4f5a61dc0d93ae22b05f8763
 2020-10-12 15:58:55 +08:00
Stanley Wang
e94d2581f8 Merge "Fix the DUS Loader item can't be searched." 2020-10-12 06:05:16 +00:00
Jason Chiu
cdfd8cc103 [automerger skipped] Reduce the flickering of injected items when package is changed am: e4b2b77452 am: 4b3d851f41 am: 615e2493ac -s ours 
am skip reason: Change-Id I77745b60f84510554bff1870a5bb7a8013eab528 with SHA-1 e4b2b77452 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880

Change-Id: I27e371d678720285b90f0e3597ec2920a2f20d58
 2020-10-12 05:06:13 +00:00
Jason Chiu
b9769e8f0b [automerger skipped] Reduce the flickering of injected items when package is changed am: e4b2b77452 am: fe66e87832 am: 3e5ce2c8e6 -s ours 
am skip reason: Change-Id I77745b60f84510554bff1870a5bb7a8013eab528 with SHA-1 20df25e6b9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880

Change-Id: I2086b8de2ef85d5398ea6e4f7fa5b67fa85cddf0
 2020-10-12 05:05:36 +00:00
Jason Chiu
615e2493ac Reduce the flickering of injected items when package is changed am: e4b2b77452 am: 4b3d851f41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880

Change-Id: I2407804b97257385d6ddf7c7a1a11365d66db00d
 2020-10-12 04:49:08 +00:00
Jason Chiu
3e5ce2c8e6 Reduce the flickering of injected items when package is changed am: e4b2b77452 am: fe66e87832 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880

Change-Id: I51833ab9e852bedd3c5bb28dc233f142e66a3238
 2020-10-12 04:49:02 +00:00
Jason Chiu
fe66e87832 Reduce the flickering of injected items when package is changed am: e4b2b77452 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880

Change-Id: Ia334ab14dd3aa48c0d48ad6adcfd50ecfcb3400a
 2020-10-12 04:32:12 +00:00
Jason Chiu
4b3d851f41 Reduce the flickering of injected items when package is changed am: e4b2b77452 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880

Change-Id: Ib2ff68b59e8aa9567d1f6f7c7281832dd323c2dc
 2020-10-12 04:31:57 +00:00
Jason Hsu
a5085443ff Merge changes I02f03ccb,I0ee46dd9 
* changes:
  Extract UserShortcutType functions from ToggleFeaturePreferenceFragment
  Add data class PreferredShortcut to replace inner class UserShortcutType
 2020-10-12 03:56:20 +00:00
tim peng
84b956ca03 Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" 2020-10-12 01:04:18 +00:00
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
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
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
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
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
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
ca40e8d31c Merge "[Settings] Remove failure JUnit test cases" 2020-10-08 06:57:35 +00:00
TreeHugger Robot
5446e7a7c4 Merge "Add randomized MAC (last used)" 2020-10-08 03:42:00 +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
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