TreeHugger Robot
79badaf738
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
am: 6cbf225a24
am: 97da27a0c3
am: c9c36430ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565
Change-Id: I6f28896033a475e020f89fec3de078d5709c0c44
2021-11-03 20:29:58 +00:00
Yanting Yang
1094f3d48a
Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
am: b0ce558a3e
am: 551083020b
am: c70af376d4
am: f7f0d4f12d
am: beb47cb0a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567
Change-Id: Ia146007476cef8d9fdca20007a69b395c7dffa38
2021-11-03 20:29:49 +00:00
Yanting Yang
4ea490df43
Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab
am: 0549b8c4e3
am: 5c0dc5688f
am: 6d13309c39
am: 2606a9cfcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566
Change-Id: I24405ff2cfb2295711aea23d3eccea6fc7806f5e
2021-11-03 20:29:38 +00:00
TreeHugger Robot
4b3ea0764a
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
am: 0fd394db07
am: a6c7b5e0f1
am: ff6f2e6a7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565
Change-Id: I275fdb5d77636c00cd281d37bffda280a7abc404
2021-11-03 20:29:00 +00:00
TreeHugger Robot
c9c36430ba
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
am: 6cbf225a24
am: 97da27a0c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565
Change-Id: Ia71bbddeae406ad03fa8cf76338df63b43c917bc
2021-11-03 20:19:37 +00:00
TreeHugger Robot
97da27a0c3
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
am: 6cbf225a24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565
Change-Id: I54b0427d0abdb5689010b70b5913eec3ae86ca35
2021-11-03 20:16:39 +00:00
Yanting Yang
beb47cb0a2
Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
am: b0ce558a3e
am: 551083020b
am: c70af376d4
am: f7f0d4f12d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567
Change-Id: Ic39381e948635281842996dafecc28451e08e470
2021-11-03 20:13:55 +00:00
Yanting Yang
2606a9cfcc
Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab
am: 0549b8c4e3
am: 5c0dc5688f
am: 6d13309c39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566
Change-Id: Ib5198c322efdee300168ba791decf26a21fa28c7
2021-11-03 20:13:49 +00:00
TreeHugger Robot
ff6f2e6a7a
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
am: 0fd394db07
am: a6c7b5e0f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565
Change-Id: Ie4377bfaa9a7691a3cd860e3b719ff985e53a2e4
2021-11-03 20:13:33 +00:00
Yanting Yang
bb213f1039
Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
am: b0ce558a3e
am: 551083020b
am: 92bfe624c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567
Change-Id: If054d367307d639e54ad09f97d0b7291d5d0eabf
2021-11-03 20:01:35 +00:00
Yanting Yang
51d3ad488c
Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab
am: 0549b8c4e3
am: 10bcda1f8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566
Change-Id: I1a73d0c9d82eea82798cf45ac7f491989c703120
2021-11-03 20:01:28 +00:00
TreeHugger Robot
93fe396f23
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
am: 6c3734f130
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565
Change-Id: I5f1a93b54e13310bfb07d34de09cd0552bf3fbcc
2021-11-03 20:01:20 +00:00
Yanting Yang
f7f0d4f12d
Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
am: b0ce558a3e
am: 551083020b
am: c70af376d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567
Change-Id: I4cf416fd79887104f3aeac8dbfbf5cc53c8048de
2021-11-03 20:01:06 +00:00
Yanting Yang
6d13309c39
Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab
am: 0549b8c4e3
am: 5c0dc5688f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566
Change-Id: If5e235b14920a609dfc2ba40c0fabe2ef81de83b
2021-11-03 20:01:01 +00:00
TreeHugger Robot
a6c7b5e0f1
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
am: 0fd394db07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565
Change-Id: I40b5bb4b7be8960cea11ab5521aa36aacf81e7ce
2021-11-03 20:00:55 +00:00
Yanting Yang
c70af376d4
Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
am: b0ce558a3e
am: 551083020b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567
Change-Id: I8ff1d7b11d4a0bb33644b8e45e1b4a455dc2c641
2021-11-03 19:52:30 +00:00
Yanting Yang
5c0dc5688f
Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab
am: 0549b8c4e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566
Change-Id: I1677fb03ae5ca4c4bd59473f967c567274457b84
2021-11-03 19:52:25 +00:00
TreeHugger Robot
6cbf225a24
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565
Change-Id: I84c50d2857869b9b2303467ef465dc29bc1e9119
2021-11-03 19:49:31 +00:00
Yanting Yang
92bfe624c5
Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
am: b0ce558a3e
am: 551083020b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567
Change-Id: I16ed0f93d162c61358108af847d35b98f7ca36ce
2021-11-03 19:48:45 +00:00
Yanting Yang
10bcda1f8b
Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab
am: 0549b8c4e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566
Change-Id: I50c55922c3bbe31c1b5a20459c34c3c8701f0116
2021-11-03 19:48:41 +00:00
TreeHugger Robot
6c3734f130
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565
Change-Id: Ie4a8948cd5f79d4fcaf4aff23fa48a73c60305cd
2021-11-03 19:48:36 +00:00
Yanting Yang
551083020b
Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
am: b0ce558a3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567
Change-Id: Ia9cfe663f267c7d8f852ca94358384df227f08b5
2021-11-03 19:48:35 +00:00
Yanting Yang
0549b8c4e3
Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566
Change-Id: I51c5b0ee5aa92de5e86c721fcaea665272c549bf
2021-11-03 19:48:30 +00:00
Yanting Yang
b0ce558a3e
Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567
Change-Id: Ia563798d9e45ec18a445b3515a6cd5f41957cf1d
2021-11-03 19:48:20 +00:00
TreeHugger Robot
0fd394db07
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565
Change-Id: Id7b8ba483f8b323c0e658d66a62c4c58f6dc17a0
2021-11-03 19:47:39 +00:00
TreeHugger Robot
3e23903ff8
Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev
2021-11-03 19:29:35 +00:00
Bill Yi
d306a89a16
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa
-s ours am: eda6485a4b
-s ours am: 56abf6d05d
-s ours am: 1b281028c2
-s ours am: 4ae59680fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901
Change-Id: I18812f3c05bb0e44497a9a5137efe009f42286d0
2021-11-03 19:25:24 +00:00
Bill Yi
4ae59680fb
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa
-s ours am: eda6485a4b
-s ours am: 56abf6d05d
-s ours am: 1b281028c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901
Change-Id: Ie83f174bb5e63301f3ed7735eb22a6372adbbc7b
2021-11-03 19:06:43 +00:00
Bill Yi
1b281028c2
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa
-s ours am: eda6485a4b
-s ours am: 56abf6d05d
-s ours
...
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901
Change-Id: Ifeae8b849e50c7a6874032bd5255e56c2f566e0b
2021-11-03 18:46:14 +00:00
Bill Yi
56abf6d05d
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa
-s ours am: eda6485a4b
-s ours
...
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901
Change-Id: Icc33406e496cfc45f87c8fc7fbc739d08b0f4ca0
2021-11-03 18:25:45 +00:00
Bill Yi
eda6485a4b
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa
-s ours
...
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1877901
Change-Id: I095493a9f49902c2bfe20a0f5464f86ae50ed536
2021-11-03 18:08:25 +00:00
Bill Yi
9d0eba50aa
Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE"
2021-11-03 17:50:39 +00:00
Jason Chiu
999a467e7c
Merge "Search experience improvement for large screen" into sc-v2-dev am: 80dd47633c
am: 3b3203cd50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101571
Change-Id: I65dd85d6ab63588900d367b52ec927a7cd9fa534
2021-11-03 12:34:57 +00:00
Jason Chiu
3b3203cd50
Merge "Search experience improvement for large screen" into sc-v2-dev am: 80dd47633c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101571
Change-Id: Ib9b823860dc063f1295d329491c0f8c7f99a4d89
2021-11-03 12:23:46 +00:00
Jason Chiu
80dd47633c
Merge "Search experience improvement for large screen" into sc-v2-dev
2021-11-03 12:08:35 +00:00
Jason Chiu
e427cc6752
Search experience improvement for large screen
...
- Support fragment and direct link in SearchResultTrampoline
- Start activity for SI case and start deep link trampoline for others
- Disable menu highlight whenever the search bar is clicked
- Don't overwrite SettingsApplication's homepage activity in
SliceDeepLinkHomepageActivity
- Scroll to highlighted menu entry after homepage is loaded to prevent
UI overlapping
Bug: 201724410
Test: manual, robotest build pass
Change-Id: I5115d17d829e85036000da2e80f0e5b0598c733f
2021-11-03 18:44:01 +08:00
Tom Hsu
9c39878c50
Merge "[Settings] Avoid crash from rotation screen." into sc-v2-dev am: 0ad93a95c6
am: acfbe351eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174733
Change-Id: I0f1676cc4d5501a19bed817a5b554652756ef0d7
2021-11-03 07:52:13 +00:00
Tom Hsu
acfbe351eb
Merge "[Settings] Avoid crash from rotation screen." into sc-v2-dev am: 0ad93a95c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174733
Change-Id: I1ba69fa41b9781be762c45577b6a44546ac4e409
2021-11-03 07:32:45 +00:00
Tom Hsu
0ad93a95c6
Merge "[Settings] Avoid crash from rotation screen." into sc-v2-dev
2021-11-03 07:15:24 +00:00
Wesley Wang
0f3a672a94
Merge "Move optimization mode backup timing into onPause" into sc-v2-dev am: bf9f91f0ad
am: e67f12f9b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177444
Change-Id: I1f9c5dd515fa42c7a30f86f9c7b135b39ff67cc5
2021-11-03 07:06:04 +00:00
Jason Chiu
d13834de52
Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600
am: 56dde819dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442
Change-Id: Ife6c9bbe5433a818d42bf91509160fea8ae924f8
2021-11-03 07:05:55 +00:00
Wesley Wang
e67f12f9b7
Merge "Move optimization mode backup timing into onPause" into sc-v2-dev am: bf9f91f0ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177444
Change-Id: I033d0ff341cae7cdb320abebfd1da765c6fa8e74
2021-11-03 06:55:06 +00:00
Jason Chiu
56dde819dc
Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442
Change-Id: I6a3448e6e54666b45f6f67288593034a03d50d64
2021-11-03 06:54:55 +00:00
Wesley Wang
bf9f91f0ad
Merge "Move optimization mode backup timing into onPause" into sc-v2-dev
2021-11-03 06:41:42 +00:00
Jason Chiu
1565bba600
Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev
2021-11-03 06:38:46 +00:00
TreeHugger Robot
6d2db7a8cf
Merge "Adjust optimize page logging timing" into sc-v2-dev am: b4e13a7af0
am: 3be2b733f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170324
Change-Id: I66ecbb8213e9fb6301d75cacb493813180df1e18
2021-11-03 05:41:03 +00:00
TreeHugger Robot
3be2b733f2
Merge "Adjust optimize page logging timing" into sc-v2-dev am: b4e13a7af0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170324
Change-Id: I4639aea50ec1cdb528f4f300c59550194f89ca60
2021-11-03 05:29:56 +00:00
TreeHugger Robot
b4e13a7af0
Merge "Adjust optimize page logging timing" into sc-v2-dev
2021-11-03 05:17:40 +00:00
Wesley.CW Wang
9b6eac28f3
Move optimization mode backup timing into onPause
...
- Move to onPause to avoid some corner case (like kill apps from recent
app won't trigger onDestroy)
Bug: 195306545
Test: make SettingsRoboTests
Change-Id: I89445a7138c30e6c869ce1c5c9a3f818997d99a7
2021-11-03 12:38:10 +08:00
Jason Chiu
9fc0f18181
Define a constant Sliceable#NO_RES for no resource cases
...
Fix: 204733076
Test: build
Change-Id: Ifa3b9db0e915a3ec056ad68a9a1862811594d423
2021-11-03 12:23:49 +08:00