Gary Jian
78b2b241a9
Merge "Add a developer option to controll mockmodemservice permission"
2022-03-23 05:46:22 +00:00
Peter_Liang
5069aa7263
Fix that strings have the similar color as the background in preview section.
...
Add the text color attribute.
Fix: 225805027
Test: manual test
Change-Id: Ie914797920631ed8e096e27ecd6e1c8184ee4505
2022-03-23 05:43:37 +00:00
Kevin Han
94eeb2d611
Merge "Update hibernation toggle string" into tm-dev am: 46adb8e175
am: 7c8166e851
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17304592
Change-Id: I8fbf7dea33fd401a0df8e12eb4446fcfa27630e4
2022-03-23 04:53:29 +00:00
Kevin Han
22f532e6f3
Merge "Update hibernation toggle string" into tm-dev am: 46adb8e175
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17304592
Change-Id: Ibe0d63375342ee268619b4c3d5bb737cab1dfa74
2022-03-23 04:38:02 +00:00
Kevin Han
7c8166e851
Merge "Update hibernation toggle string" into tm-dev am: 46adb8e175
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17304592
Change-Id: Ibd698dd496b29770d5f1112871408e96cf0ff32e
2022-03-23 04:37:43 +00:00
Kevin Han
46adb8e175
Merge "Update hibernation toggle string" into tm-dev
2022-03-23 04:24:38 +00:00
Kedar Chitnis
948dee1b6f
Guest mode UX flow updates to user settings
...
- Add option in user settings to enable/disable ephemeral
mode for guest user
- Update user settings to show exit guest and reset guest preferences
- Update user settings to show guest related preferences grouped together
Bug: 214031645, 175795666
Screenshots: go/ephemeral-guest-b-214031645-ux
Test: Manual test on sunfish, atest SystemUITests, atest SettingsRoboTests
Change-Id: I7cf205883f8250178ac24c67c74b9142ceb6c1f5
2022-03-23 03:42:37 +00:00
SongFerng Wang
cc48d8a92e
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
am: 285952a80e
am: eefaf62ba7
am: 08e5d43e54
am: 210a422be0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: I34e0a9ed287a521b387199d1f1bdbd18aa122aff
2022-03-23 03:39:51 +00:00
SongFerng Wang
c9e1a00fea
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
am: 285952a80e
am: eefaf62ba7
am: 08e5d43e54
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: I08863750462b894c6d06f436b77fe6f2b9185ea9
2022-03-23 03:19:15 +00:00
SongFerng Wang
210a422be0
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
am: 285952a80e
am: eefaf62ba7
am: 08e5d43e54
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: I139f8be6d4dea2b92ba7e0676c83c01f235d50eb
2022-03-23 03:18:43 +00:00
Hugh Chen
b355af9a87
Update the string
...
Bug: 225982666
Test: build pass
Change-Id: I47a9a27fedcc657d1cbd41708607174486d33fc2
2022-03-23 03:04:23 +00:00
SongFerng Wang
08e5d43e54
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
am: 285952a80e
am: eefaf62ba7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: I1a191387a358a40da753539284bba70d050a9bcd
2022-03-23 02:54:26 +00:00
SongFerng Wang
eefaf62ba7
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
am: 285952a80e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: Iabc7d3cf66470bd96c2b5caac2469eac888b2ae2
2022-03-23 02:34:07 +00:00
SongFerng Wang
285952a80e
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: I98125699c5fe13fe7acbd7668be1e12b6bcedcd6
2022-03-23 02:11:19 +00:00
TreeHugger Robot
e3c72714e4
Merge "Remove myself from OWNERS."
2022-03-23 02:08:23 +00:00
SongFerng Wang
75869b5fef
Merge "[LE adudio] The condition of right location is wrong."
2022-03-23 01:52:05 +00:00
Weng Su
f5cd7140f4
Fix adding wifi configuration issue
...
- The Wi-Fi Enterprise Restrictions add a new
UserManager.DISALLOW_ADD_WIFI_CONFIG restriction from T.
- When a user requests to add Wi-Fi configuration, Settings will
reject the request if the user is not allowed.
- The above restriction need to be retrieved in advance so that the
user's request will not be rejected.
- See the result screenshot in b/224459753#comment8
Bug: 224459753
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivity
Change-Id: I2dfb6b9946dd9dbd4eb8bf0f6549ac5cb4466f17
2022-03-23 06:18:55 +08:00
Kweku Adams
cb369d3cf0
Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f
am: 45b3c9f280
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259
Change-Id: I268445fd2f6f1982273b07f47ae231b1fed776d1
2022-03-22 19:25:27 +00:00
Kweku Adams
bf86bbb5a7
Merge "Make reward constants configurable." into tm-dev am: 32edc913a7
am: 81e1f511d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186
Change-Id: I81d11ff81b193064640cd8fb07f879997d4e6350
2022-03-22 19:24:44 +00:00
Kweku Adams
f264728eaf
Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259
Change-Id: Ifefec87c41acdf4e8e47a78f82cd2aba809e9389
2022-03-22 19:08:04 +00:00
Kweku Adams
e1b959bbef
Merge "Make reward constants configurable." into tm-dev am: 32edc913a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186
Change-Id: I366f2939c28b8a00b164c6912af59c6f717038ea
2022-03-22 19:07:43 +00:00
Kweku Adams
45b3c9f280
Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259
Change-Id: If6df2836e323f94f99c4fd1a629ff015253a11b2
2022-03-22 19:06:45 +00:00
Kweku Adams
81e1f511d7
Merge "Make reward constants configurable." into tm-dev am: 32edc913a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186
Change-Id: I8fc365e90a44177b5f5dc25a9f8a9e513c36bb99
2022-03-22 19:06:38 +00:00
Kweku Adams
240e85be9f
Merge "Fix inaccessible view issue." into tm-dev
2022-03-22 18:59:25 +00:00
SongFerngWang
418d78f978
[LE adudio] The condition of right location is wrong.
...
1. Fix the condition of right location.
2. If the location is left+right, showing the legacy battery style.
Bug: 225800014
Test: build pass. local test.
Change-Id: I03d1d7bfe26d52e0b69d24aec6bd3216350403a0
2022-03-23 02:55:06 +08:00
Yanli Wan
e80aad534a
Merge "Update financed device info strings"
2022-03-22 18:53:27 +00:00
Eric Biggers
af587fd3df
Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
am: 465363a312
am: b79a82260c
am: 98ac6a6c01
am: b28d6c6c76
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423
Change-Id: I61aac53cb4f668db3f092d8379bbf358ed3f5774
2022-03-22 18:51:28 +00:00
Kweku Adams
32edc913a7
Merge "Make reward constants configurable." into tm-dev
2022-03-22 18:45:36 +00:00
Eric Biggers
9e3afb97ca
Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
am: 465363a312
am: b79a82260c
am: 98ac6a6c01
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423
Change-Id: I54f937fb29a9c16816911dc3e851b732e71b8c72
2022-03-22 18:32:34 +00:00
Eric Biggers
b28d6c6c76
Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
am: 465363a312
am: b79a82260c
am: 98ac6a6c01
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423
Change-Id: Icc017c4f8cfeba0e0d5eabcbb592337bf296fbf0
2022-03-22 18:31:43 +00:00
Weng Su
98d30c880d
Fix ConnectivityManager.requestNetwork crash issue when try again
...
- When the user requests "try again", the Network-Request-Dialog will be
recreated. If the Wi-Fi framework sends the callback result at this
time, the Network-Request-Dialog may not be ready at the moment,
causing the NPE to crash.
- Add NPE checks to avoid crash issues.
Bug: 220679437
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=NetworkRequestDialogActivityTest
Change-Id: I8e48a29649e72d9f8c67c4ac24f0eb27ba600dae
2022-03-22 18:14:22 +00:00
Eric Biggers
98ac6a6c01
Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
am: 465363a312
am: b79a82260c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423
Change-Id: I46e1ca934dff648e8730d445046fa3150913891b
2022-03-22 18:04:27 +00:00
Eric Biggers
b79a82260c
Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
am: 465363a312
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423
Change-Id: Ieb1bf012ee0f735dcfc4d579eee9fc587bfbdbe1
2022-03-22 17:47:03 +00:00
Eric Biggers
465363a312
Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423
Change-Id: Ieadee7a7c884500a836b5f118fce9b649e9e179b
2022-03-22 17:46:14 +00:00
Eric Biggers
d106ae0f82
Merge "Remove EXTRA_KEY_TYPE intent data"
2022-03-22 17:37:33 +00:00
Kweku Adams
eee64f2f73
Fix inaccessible view issue.
...
When fully expanded, the last item in the ExpandableListView was half
off the screen, making it hard to see what the value was and update it.
Tweaking the layout to ensure the last item is properly visible.
Bug: 158300259
Bug: 189850067
Test: Visual inspection
Change-Id: Ifc60e220276db6ee6d4dea57957b0b52b1934dbe
2022-03-22 17:37:22 +00:00
Kweku Adams
10ef599170
Make reward constants configurable.
...
Make it possible to configure the instant and max values of all
supported actions. Ongoing rewards will be enabled later.
Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Manual
Change-Id: Ia854f18820f3fe95b3b1448c5fa8411853859052
2022-03-22 17:37:07 +00:00
Michael Lu
b4e07cdff4
Remove myself from OWNERS.
...
Test: N/A
Change-Id: I6a8139e569a31ea3983df0db970a36b841e646d4
2022-03-22 17:29:48 +00:00
TreeHugger Robot
a002d1c937
Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev am: 285cfcda41
am: 5f6672c459
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17292747
Change-Id: I378ecfc73abeb71f4b9f9c6cb6a984be81f77f86
2022-03-22 15:08:32 +00:00
TreeHugger Robot
5f6672c459
Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev am: 285cfcda41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17292747
Change-Id: I8f887febbba78ad0e002322c846375dd5883eb65
2022-03-22 14:48:09 +00:00
TreeHugger Robot
af18f6353c
Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev am: 285cfcda41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17292747
Change-Id: I4f24c0f10032ef9d661e1ba1d555099f6bfe7e8d
2022-03-22 14:43:36 +00:00
TreeHugger Robot
285cfcda41
Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev
2022-03-22 14:42:43 +00:00
Yuri Ufimtsev
ba1b11800a
Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1c4
am: f295baf541
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17253603
Change-Id: I1b66c45efac0c81a6536f03897a986bdc3f7f2e0
2022-03-22 14:11:42 +00:00
Yuri Ufimtsev
c6e1936960
Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e
am: aa30c6c595
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743
Change-Id: I15e64d86e0b880870d6c2b35aaf8899427cda9c3
2022-03-22 14:10:56 +00:00
Yuri Ufimtsev
d4165ec9e1
Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17253603
Change-Id: Ied8cb07c3ddd89a28e167c6eb18eaea534c6a250
2022-03-22 13:55:41 +00:00
Yuri Ufimtsev
f295baf541
Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17253603
Change-Id: Ie8a10ade44a05142451df6fdccc8ac6262a66bd2
2022-03-22 13:55:38 +00:00
Yuri Ufimtsev
b1469cce58
Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743
Change-Id: Ic2fe73e794f3f41708308762757270024e696a93
2022-03-22 13:55:33 +00:00
Yuri Ufimtsev
aa30c6c595
Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743
Change-Id: Ieb3dc8368db13a43d95c981d2602d182d7ccbf01
2022-03-22 13:55:02 +00:00
Yuri Ufimtsev
b39ab3e1c4
Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev
2022-03-22 13:41:33 +00:00
Yuri Ufimtsev
7e7d3f898e
Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev
2022-03-22 13:41:09 +00:00