Bill Yi
2db38749b8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df
-s ours am: 9769c467a3
-s ours am: 046a9c0cf4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710138
Change-Id: I68c99738ff14aec272ae3b95764ad1aa5513f101
2021-05-26 11:17:59 +00:00
TreeHugger Robot
e38629984e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6
-s ours am: ae2b2f8b49
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710143
Change-Id: I7f8566e696824757e9537555be1e50592baab6a0
2021-05-26 11:17:32 +00:00
TreeHugger Robot
b6194a0a6d
Merge "Update fonts & colors" into sc-dev am: bdd98ec216
am: 84a7d602f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067
Change-Id: I1fd37bcd59631ab7f8424088ba476d4db4242c22
2021-05-26 11:17:13 +00:00
TreeHugger Robot
175dc29f82
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1
-s ours am: a17ed53f3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710140
Change-Id: Ifd0d4b4721467dc2d48d089c1407ba636882de35
2021-05-26 11:17:09 +00:00
Yanting Yang
ab6138d428
Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c
am: b3ce2ff016
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192
Change-Id: I685844009b94278ce193ed70228a05f3a36dae1b
2021-05-26 11:15:12 +00:00
Jernej Virag
1313c0dd3a
Merge "Add a setting to enable or disable corner invocation of assistant app" into sc-dev am: 1baf9a867e
am: e26626e29c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502326
Change-Id: Ic9deaccc9b197500129f12c23d4d8884a67d5fd9
2021-05-26 11:14:53 +00:00
TreeHugger Robot
053c22a2a8
Merge "Suppress shared axis transition on Brightness level" into sc-dev am: b2a97fb735
am: 8b5566614f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682964
Change-Id: I648c332b1e1355998385cbebcc6a7f89aab68733
2021-05-26 11:13:45 +00:00
Yanting Yang
db776cb416
Merge "Remove Advanced section" into sc-dev am: 5dede180cd
am: 2d7a5d1fe9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716191
Change-Id: I6955484711e1d219de54c385c955d0b64c255ea1
2021-05-26 11:12:39 +00:00
Felipe Leme
37c36324f0
Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084
Change-Id: I454ed375f20c77f6c911214e465e46b86598e1b9
2021-05-26 11:08:49 +00:00
TreeHugger Robot
154e668da7
Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760
Change-Id: If7f51e788545028384565b3657940027d8173b2f
2021-05-26 11:08:36 +00:00
TreeHugger Robot
0e9522b076
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc
-s ours am: 37947fc40c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710135
Change-Id: I9737e8a498870b10348ef9b393a65541bdcf35f1
2021-05-26 11:08:31 +00:00
Bill Yi
b00c1efc8e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64
-s ours am: 1474e88ef3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710136
Change-Id: Ia3e31c7d283823ea9d67f1630d1e55c38d6e0e5e
2021-05-26 11:08:27 +00:00
TreeHugger Robot
9065eb3210
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6
-s ours am: f556c56609
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710137
Change-Id: I55f7d48c081e171cb372753cf6ebddc280e5dfe5
2021-05-26 11:08:24 +00:00
Bill Yi
046a9c0cf4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df
-s ours am: 9769c467a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710138
Change-Id: Ia1baf4a60467289081501a1edfe69f8b7230b5ad
2021-05-26 11:08:20 +00:00
TreeHugger Robot
ae2b2f8b49
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710143
Change-Id: I9309c17d9aefe484a293ad4256d652e0aee7d552
2021-05-26 11:08:00 +00:00
TreeHugger Robot
84a7d602f5
Merge "Update fonts & colors" into sc-dev am: bdd98ec216
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067
Change-Id: I720e32099f9cf984eecd3e51e3065f0827018a2a
2021-05-26 11:07:56 +00:00
TreeHugger Robot
a17ed53f3a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710140
Change-Id: If34a9493ed7fbabe2ff784a021a48e6513b6bb64
2021-05-26 11:07:50 +00:00
Yanting Yang
b3ce2ff016
Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192
Change-Id: I85fcdffc9b1f67298f03a9055b8bda919c4ac715
2021-05-26 11:07:46 +00:00
Jernej Virag
e26626e29c
Merge "Add a setting to enable or disable corner invocation of assistant app" into sc-dev am: 1baf9a867e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502326
Change-Id: If2bbba01418485dec658f11b7ba211f1ce6eb460
2021-05-26 11:07:41 +00:00
TreeHugger Robot
8b5566614f
Merge "Suppress shared axis transition on Brightness level" into sc-dev am: b2a97fb735
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682964
Change-Id: Icf4b9f32aa8e0c0d98762d1f6616863bb4607765
2021-05-26 11:07:33 +00:00
Yanting Yang
2d7a5d1fe9
Merge "Remove Advanced section" into sc-dev am: 5dede180cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716191
Change-Id: I0ca163db73e4b451b1be7c8325095db9d20fb31f
2021-05-26 11:07:24 +00:00
TreeHugger Robot
c7d1192ebb
Merge "Simplify the transition logic." into sc-dev am: 5b24943b06
am: cd82b94eff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099
Change-Id: I992f1c528ea4643e9ac13fe72481b8847dbafdd3
2021-05-26 11:01:25 +00:00
Automerger Merge Worker
e959cc554f
Merge "Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4
am: 9e9c2508bf" into sc-v2-dev-plus-aosp
2021-05-26 11:01:20 +00:00
TreeHugger Robot
3b5672415e
Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4
am: 9e9c2508bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711
Change-Id: I71cf66171c5211375fedb8cf5f4a2667937f02e9
2021-05-26 11:01:17 +00:00
TreeHugger Robot
1777269c87
Merge "Support different types of transitions." into sc-dev am: 332ee0f374
am: 49d0153039
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961
Change-Id: I8816392867a15914859d10d62e73219319516514
2021-05-26 11:01:13 +00:00
TreeHugger Robot
49d0153039
Merge "Support different types of transitions." into sc-dev am: 332ee0f374
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961
Change-Id: I57839d47380e9e56f1442f1d51c8254baf2be411
2021-05-26 10:53:30 +00:00
TreeHugger Robot
cd82b94eff
Merge "Simplify the transition logic." into sc-dev am: 5b24943b06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099
Change-Id: Ib9ce328500c32c9e10a31c6e0a7fa0a6aa7e49c0
2021-05-26 10:46:19 +00:00
TreeHugger Robot
9e9c2508bf
Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711
Change-Id: Ie358e3e5e591a094a56f94da6957257e1e80ff01
2021-05-26 10:46:02 +00:00
TreeHugger Robot
5b24943b06
Merge "Simplify the transition logic." into sc-dev
2021-05-26 10:45:41 +00:00
TreeHugger Robot
4f9d0f4eb4
Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev
2021-05-26 10:26:20 +00:00
YUKAI HUNG
7045ec0b67
Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863
am: 64a11c5a87
am: ff51d80270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402
Change-Id: Iba420b51045795d8ee9f42a1f030e63e020329f5
2021-05-26 09:52:23 +00:00
TreeHugger Robot
274ac5d14f
Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f
am: 9035a8f4bb
am: 7839e46ba9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606
Change-Id: I874e07dd128e42d293f43bcf6cfc5539b5293dd9
2021-05-26 09:52:08 +00:00
Yanting Yang
385d4ab587
Merge "Remove silky flag from Display for official release" into sc-dev am: d5aaf326e7
am: 97d6bac2f4
am: c6feed297f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716096
Change-Id: Idd559d7c16633e916e52d8fc346db801466ea948
2021-05-26 09:51:17 +00:00
Hugh Chen
51b6605aef
Fix connected devices settings jank issue
...
Completed the UI in displayPreference() to fix jank issue.
Bug: 188752628
Test: make RunSettingsRoboTests
Change-Id: Ib97b76e1b8622424ad481597f63d3540fb0bfc5b
2021-05-26 17:37:13 +08:00
YUKAI HUNG
ff51d80270
Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863
am: 64a11c5a87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402
Change-Id: I345c28cef4e81669aca4cf2e085e6ca5b167ee3e
2021-05-26 09:35:57 +00:00
TreeHugger Robot
7839e46ba9
Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f
am: 9035a8f4bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606
Change-Id: Ie89c0cfece7aab58dde4aa12cdef3fabf0b4f86f
2021-05-26 09:35:52 +00:00
Yanting Yang
c6feed297f
Merge "Remove silky flag from Display for official release" into sc-dev am: d5aaf326e7
am: 97d6bac2f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716096
Change-Id: I854f59b936562153cdf5fc4a2dd1778454d4712b
2021-05-26 09:35:45 +00:00
YUKAI HUNG
64a11c5a87
Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402
Change-Id: Id2090b3130faf66b16191f7707648c6a97ce5ac1
2021-05-26 09:29:02 +00:00
YUKAI HUNG
7164ec8863
Merge "Disable app usage item if this item is not clickable" into sc-dev
2021-05-26 09:25:54 +00:00
TreeHugger Robot
9035a8f4bb
Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606
Change-Id: Ib164239dd7d105faca19a6bef5e1e877e5c8b074
2021-05-26 09:24:02 +00:00
Weng Su
7b8c367d4f
[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel
...
- Replace the left menu button with "Turn off/on Wi-Fi"
- Remove the TurnOnWifiSlice
- Show "Wi-Fi is off" sub-title when Wi-Fi is disabled
- Remove the "Wi\u-Fi is turned on" sub-title when APM is on.
Bug: 188710392
Test: manual test
atest -c InternetConnectivityPanelTest
make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.panel
Change-Id: I53e200f6cadf8b712bf794bcbd5ff79f0f239cc0
2021-05-26 17:22:38 +08:00
Yanting Yang
97d6bac2f4
Merge "Remove silky flag from Display for official release" into sc-dev am: d5aaf326e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716096
Change-Id: I8a62acbd8d9ff7b9fde22a83001a05dad7148d22
2021-05-26 09:21:37 +00:00
TreeHugger Robot
328de8d98f
Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev
2021-05-26 09:21:34 +00:00
Betty Chang
360cf8a97f
Merge "Remove all the dividers in Wifi Settings" into sc-dev am: 3007bc21cb
am: cf81b181ae
am: f4ded72d3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716097
Change-Id: Ifd13ac320188cb454420623c9ecad1c39073d25c
2021-05-26 09:19:57 +00:00
changbetty
916bac8f2e
Adding an option to install a certificate from the CA certificate menu
...
For CA ceritificate we only can install in Network Preferences > Advaned
> Install certificates. So we add the option for user to install when
you setup the wifi network. After you install the certificate, you can
see the certificate in your menu.
Bug: 176998563
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: I532b12f9277c6a15c649907fa3711c807566c88e
2021-05-26 16:37:14 +08:00
Yanting Yang
d5aaf326e7
Merge "Remove silky flag from Display for official release" into sc-dev
2021-05-26 08:35:32 +00:00
Betty Chang
f4ded72d3e
Merge "Remove all the dividers in Wifi Settings" into sc-dev am: 3007bc21cb
am: cf81b181ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716097
Change-Id: Icbd5fc0fd8eff0f06ba893af0d210dbad81e6d75
2021-05-26 08:35:27 +00:00
Betty Chang
cf81b181ae
Merge "Remove all the dividers in Wifi Settings" into sc-dev am: 3007bc21cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716097
Change-Id: Id669e954f7820371ad3f2ab77115605436869ef4
2021-05-26 08:14:12 +00:00
YUKAI HUNG
01f1b6ddea
Merge "Refine consumed battery value formula for power component" into sc-dev am: f49190d769
am: 1fea339388
am: 6b68a9da24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702397
Change-Id: I6def66c979b10d9e60cd7237a8be1ff53a954199
2021-05-26 07:58:33 +00:00
Jason Chiu
171c948091
Merge "Add icon declaration in metadata for injected activities" into sc-dev am: a1b818a8d8
am: 8bf47584de
am: 77dae23b10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682966
Change-Id: Ib1e3a066e02c0e75662adf7df1dd9350de4d2498
2021-05-26 07:57:58 +00:00