TreeHugger Robot
4ce89147b7
Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
am: ce685b4142
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174
Change-Id: Ia76e93e5631dbd07f4c613977d11cb29182a36e8
2020-06-18 13:59:43 +00:00
TreeHugger Robot
ce685b4142
Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174
Change-Id: Iaf94f87697c7e7f4c86475f8c291502a1d441f22
2020-06-18 13:44:59 +00:00
TreeHugger Robot
ea45695190
Merge "Launch work dnd setting for work-profile apps" into rvc-dev
2020-06-18 13:32:43 +00:00
Jason Chiu
cab15b0d65
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
am: e623f69f29
am: a4e005e0ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: I354149a6d6015e2a3b6b2d1aff190524279445f8
2020-06-18 11:49:19 +00:00
Jason Chiu
a4e005e0ef
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
am: e623f69f29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: I7fa7892e91b9db37728930fcf70652b891ba765d
2020-06-18 11:36:26 +00:00
Jason Chiu
e623f69f29
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: Iaa2d45ff44dbf212886085bcee4433b7e4402886
2020-06-18 11:23:49 +00:00
Jason Chiu
251b98492f
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev
2020-06-18 11:06:42 +00:00
Yanting Yang
93b72cdd79
Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755
am: bdbcd02a09
am: 4f63c8d5a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411
Change-Id: I48e36e6aec542d54668326d8439deab481c3fb14
2020-06-18 10:52:22 +00:00
Yanting Yang
4f63c8d5a9
Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755
am: bdbcd02a09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411
Change-Id: I6c7731402386659cd61c45e67c6edadb1759ec01
2020-06-18 10:41:47 +00:00
Yanting Yang
bdbcd02a09
Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411
Change-Id: Ib3c4bc91cc51a409b29455e4f00bc423b389a709
2020-06-18 10:21:11 +00:00
Yanting Yang
c8e0d2e755
Merge "Avoid NPE when screen title is null" into rvc-dev
2020-06-18 09:58:47 +00:00
TreeHugger Robot
6fca027244
Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f
am: dae8a5bff1
am: 037eb6b776
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420
Change-Id: Ib28a3d9968aaba573d05d17cfb557ee1825a2bef
2020-06-18 09:52:45 +00:00
TreeHugger Robot
037eb6b776
Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f
am: dae8a5bff1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420
Change-Id: Iac142b41a16bf2fcfc3192801a2c3cfd00fd5a1c
2020-06-18 09:40:31 +00:00
TreeHugger Robot
dae8a5bff1
Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420
Change-Id: I0e19896545564be3c19be24c2ea2493c10b8f0d9
2020-06-18 09:19:46 +00:00
TreeHugger Robot
52707fce4f
Merge "Workaround for Recent app icon disappear" into rvc-dev
2020-06-18 09:10:00 +00:00
TreeHugger Robot
25288095bc
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev am: e47478ddcc
am: 41f4d72ea2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11881678
Change-Id: Ia0e523fe424056b0b9bfe4b6c934143373f5760e
2020-06-18 08:33:30 +00:00
TreeHugger Robot
9774deb533
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev am: e47478ddcc
am: 65cb9c9c1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11881678
Change-Id: I61cbd81b4872b34cb23bdf3d47c8496e94a63d3c
2020-06-18 08:33:15 +00:00
TreeHugger Robot
65cb9c9c1d
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev am: e47478ddcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11881678
Change-Id: I6594136afd56b93290c919e09c7e34b66bf62bb4
2020-06-18 08:20:08 +00:00
TreeHugger Robot
41f4d72ea2
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev am: e47478ddcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11881678
Change-Id: I25340023927d1cbb86b497979cfe9344f5fdd8a8
2020-06-18 08:19:55 +00:00
TreeHugger Robot
e47478ddcc
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev
2020-06-18 08:06:13 +00:00
TreeHugger Robot
8da9a0813a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours am: cdaf90029f
-s ours am: debdb0f32d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889176
Change-Id: Ie731009ffd14fd2a9618d002978cce38487952ba
2020-06-17 19:50:11 +00:00
TreeHugger Robot
debdb0f32d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours am: cdaf90029f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889176
Change-Id: Ib158fe84fb02e799f0f86d53b002e679e409232a
2020-06-17 19:22:22 +00:00
TreeHugger Robot
cdaf90029f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889176
Change-Id: I93fce8d35db8a225adc0c8f7431007d512dd9d1e
2020-06-17 19:04:10 +00:00
TreeHugger Robot
21099bcb95
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-17 18:51:02 +00:00
Jason Chiu
0625bb4815
Fix the overlapping problem of the burst of slice updates
...
Implement a throttle in SliceBackgroundWorker to control slice updates.
Test: robotest
Fixes: 152366832
Change-Id: I8b65d1b57973e036b932172627aca506f4fae3a4
2020-06-18 02:18:38 +08:00
Bill Yi
553dcca790
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Id87875585903185c64f8ed91c03dd50ca9e06b39
2020-06-17 09:27:34 -07:00
Beverly
51fb73e512
Launch work dnd setting for work-profile apps
...
Test: manual
Fixes: 159178762
Change-Id: Ifa4c7f776e19f3aec87b5ef1f858c92cff46b30b
2020-06-17 11:57:19 -04:00
Yanting Yang
72c2fa5a3d
Avoid NPE when screen title is null
...
The screen title of Settings pages could be empty, e.g., Mobile network
detail page. It will cause NPE when Settings generates the slice
object, and then results in the Settings Search showing empty view for
slice search result. It’s a bad user experience, we need to add the null
check to avoid it.
Bug: 157986273
Test: robotests
Change-Id: I8bf6a081c6b3e97ccb173424ff4a310ae863ae2f
2020-06-17 23:49:09 +08:00
TreeHugger Robot
00b3b49673
Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a
am: f6afc2658f
am: 6a7a3b70b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609
Change-Id: I477715f859695616ba363c23642aaa5d23430ec5
2020-06-17 12:38:31 +00:00
TreeHugger Robot
6a7a3b70b9
Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a
am: f6afc2658f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609
Change-Id: I7a61c3d9e51062a3ed4779517573960c4fd1ee95
2020-06-17 12:27:07 +00:00
TreeHugger Robot
f6afc2658f
Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609
Change-Id: Id5ec044f6f29ecee29e9efad075eeeaa38d7fa10
2020-06-17 12:14:51 +00:00
TreeHugger Robot
16e1cd296a
Merge "Add new Always on display slice" into rvc-dev
2020-06-17 12:04:21 +00:00
Edgar Wang
e1186254d4
Add new Always on display slice
...
Currently we create Always on Display slice through
AmbientDisplayAlwaysOnPreferenceController. However, as the Always on
Display is merged into Idle lock screen, the conversion won't work
properly anymore when devices support the aware sensor.
Hence, we create another custom slice for this purpose.
Bug: 145920511
Test: manual & robotest
Change-Id: Ifd90e2de5219bd4e97aa13b5855fdab95ff6c4d0
2020-06-17 07:52:01 +00:00
Mark Chien
7248e67343
Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d
am: 9b626fce11
am: 56b98ca21e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847
Change-Id: I0b5c3c9f0b7d4b321fd98bc081bf01c4fa4945a2
2020-06-17 06:49:06 +00:00
Mark Chien
56b98ca21e
Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d
am: 9b626fce11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847
Change-Id: I292081bbb95489c9210a037842ca820b649ad168
2020-06-17 06:37:33 +00:00
Tim Peng
28dcfda0bf
Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b
am: 38168ef519
am: 620253c196
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401
Change-Id: Id44591aed348bcdd0377a694bf19a6ea62d7d6e5
2020-06-17 06:31:01 +00:00
Mark Chien
9b626fce11
Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847
Change-Id: I496104d3aff4f6937cf4445c7b0eef272d12e5df
2020-06-17 06:24:22 +00:00
Tim Peng
620253c196
Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b
am: 38168ef519
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401
Change-Id: I72a47cce2ea61afb442f8c8354e4e845a922d994
2020-06-17 06:12:27 +00:00
Mark Chien
481816a97d
Merge "Get entitlement configuration from intent extra" into rvc-dev
2020-06-17 06:07:52 +00:00
Tim Peng
38168ef519
Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401
Change-Id: I7ef704688ca82229f110e82441213d8344883bea
2020-06-17 05:59:06 +00:00
markchien
e22bd7a2e8
Get entitlement configuration from intent extra
...
Tethering resource configuration is move from framwork to tethering
module. The resource would not be accessible from outside of tethering
module.
List the replacements of framework resources usage and intent extra:
1. R.string.config_mobile_hotspot_provision_response
--> android.net.extra.TETHER_PROVISIONING_RESPONSE.
2. R.string.config_mobile_hotspot_provision_app_no_ui
--> android.net.extra.TETHER_UI_PROVISIONING_APP_NAME
3. R.array.config_mobile_hotspot_provision_app
--> android.net.extra.TETHER_SILENT_PROVISIONING_ACTION
Besides, the current active subId would put in
android.net.extra.TETHER_SUBID
Note: They are not APIs because of API freeze. Now both tethering module
and Settings define these strings independently. Will replace hard code
string as tethering module-lib APIs in b/159085857.
Also move the entitlement response intent registeration from onCreated
to onStartCommand, this can avoid wrong intent registeration if subId
changed between onCreate and when the intent arrived.
Bug: 146918263
Test: atest TetherServiceTest
atest TetherProvisioningActivityTest
Change-Id: I3d06df01302a9c1f0893712d9250fe394dc66588
2020-06-17 05:47:17 +00:00
Tim Peng
7084631b4b
Align Slice Row title icon with Panel icon in output switcher panel
...
-Icon size changes and padding needs to be updated
-Apply padding to output switcher panel
-Remove padding from generic slider panel
Bug: 159179348
Test: manual test
Change-Id: I063926f4b22f6aaa1187b78efa570009fe02d5c4
2020-06-17 12:02:26 +08:00
Mark Chien
1d05abe366
Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b
am: bb8f08013b
am: cb57d2247d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805
Change-Id: Ifc0519178b1ab808e63b71072eb044167efba41a
2020-06-17 03:15:37 +00:00
Mark Chien
cb57d2247d
Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b
am: bb8f08013b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805
Change-Id: Ie3a9e582c1dce1e714c2f40f137333fd9eec52f3
2020-06-17 02:58:21 +00:00
Mark Chien
bb8f08013b
Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805
Change-Id: I3c59ccf36d2912c96ef9a2267ebf4742f4765e52
2020-06-17 02:47:31 +00:00
Mark Chien
5bd41e573b
Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev
2020-06-17 02:29:35 +00:00
Mehdi Alizadeh
1a3e35b3b2
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: 634e0ac8b3
am: dfe74931a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: Ic736affe694018690b9fdbd0e3fac73b7b7d0ba8
2020-06-16 23:40:24 +00:00
Automerger Merge Worker
fb2e613c74
Merge "Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: eab293354a
am: 29e6eb0513" into rvc-qpr-dev-plus-aosp
2020-06-16 23:40:10 +00:00
Mehdi Alizadeh
296b9dcbe3
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: eab293354a
am: 4d896e3da8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: Ic9b70cd934b937a2c45efac6f637ec53f8188753
2020-06-16 23:40:02 +00:00
Mehdi Alizadeh
7594ae50d6
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: eab293354a
am: 29e6eb0513
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I0da94dcda22a49f1ebc8221934b0c3c3e5041119
2020-06-16 23:39:57 +00:00