TreeHugger Robot
0f86f86a70
Merge "Fix checkcolor_hook error"
2022-09-22 12:44:26 +00:00
Ayush Sharma
a00393015a
Merge "For top layout use FrameLayout than GlifLayout"
2022-09-22 12:41:37 +00:00
tom hsu
3d138b372b
[Settings] Update UI when bluetooth connection is down.
...
- When Airplane mode on, all connection shall be disconnected. In
current design, when bluebooth disconnected, network page in Settings
does not udpate the UI.
Bug: b/246925011
Test: Maunal
Change-Id: I1bf56e96737157d8e76057028b22e94e0e8d76e4
2022-09-22 19:34:35 +08:00
Sunny Shao
f35d7f5f0e
Fix checkcolor_hook error
...
Bug: 247692342
Test: repo upload OK
Change-Id: I8fc4db6f880b073e44a78d63fcd99cc86c2255d8
2022-09-22 19:26:59 +08:00
PETER LIANG
93a613f2f6
Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev am: 71c3e06bea
am: dace33e3c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997091
Change-Id: I2de86b0a6b8eac29e04fb8ce6c77750d88321322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 09:20:28 +00:00
Jason Hsu
fef9587cfe
[automerger skipped] Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac1712145
am: b161bade37
-s ours
...
am skip reason: Merged-In Ic0be940c8466b5e1e301255868c29d06bd4428bd with SHA-1 cfec092373
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20008465
Change-Id: I167132c5bd4fc2d6ec7af7575f05e18a704a57c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 09:19:39 +00:00
PETER LIANG
dace33e3c3
Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev am: 71c3e06bea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997091
Change-Id: I735fa2d96c60a92c270208620909353c25619960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 08:51:25 +00:00
PETER LIANG
71c3e06bea
Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev
2022-09-22 08:29:50 +00:00
Jason Hsu
b161bade37
Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac1712145
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20008465
Change-Id: I2a8dd8e4bb9f11ab239ec7a4e420b38c52623a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 08:27:44 +00:00
Jason Hsu
9ac1712145
Merge "Fix not on the top when entering device detail page" into tm-qpr-dev
2022-09-22 07:37:28 +00:00
Zekan Qian
daceb0cabb
Merge "Explicitly set parameter name when call SettingsPage.create function"
2022-09-22 07:18:03 +00:00
Bonian Chen
e32f252b8a
Merge "[Settings] Remove unreferenced method"
2022-09-22 06:23:36 +00:00
Chaohui Wang
faf11f96e7
Merge "Clean up AppButtonsPreferenceController"
2022-09-22 04:59:12 +00:00
Bill Lin
4c9e259ccd
Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev am: a46b426bcf
am: 8a8fe4fabd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19989471
Change-Id: Id20b934f044607e7b4f93b2d5cb5ce37322fd65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 03:42:27 +00:00
Zekan Qian
90e5e91f28
Explicitly set parameter name when call SettingsPage.create function
...
Bug: 244122804
Test: manual - build SettingsGoogle
Change-Id: I068857ac3a5e12cfcf0148789b546476663414e1
2022-09-22 11:08:02 +08:00
Bill Lin
8a8fe4fabd
Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev am: a46b426bcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19989471
Change-Id: I4b46bef348873f663b4c7368a2e659359e6f8486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 02:46:29 +00:00
Chaohui Wang
d21f5916d2
Clean up AppButtonsPreferenceController
...
mDisableAfterUninstall and mUpdatedSysApp is always false.
And appChanged is always true.
Bug: 236346018
Test: Manual with Settings App
Change-Id: Icfb9fbea92d5c728cbef9d76569d59d5085a51e6
2022-09-22 10:02:44 +08:00
Bill Lin
a46b426bcf
Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev
2022-09-22 01:55:59 +00:00
Peter Liang
6a847bba04
Fix that display size and text preview is going blank while scrolling the page in landscape view.
...
Problem:
It seems that the inconsistent index would cause the view stub couldn't be inflated successfully.
Solution:
Adjust it to the same index.
Fix: 244336110
Test: manual test
Change-Id: I2688e6feb61ac64f989e5f8e4910e6eeca3a97bf
2022-09-22 01:20:45 +00:00
TreeHugger Robot
d8bba54a42
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours am: ac3b26c186
-s ours am: 870f086d09
-s ours am: e0bbfab81c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Iad6c487d2effc358777b929483c4cc13b19b1fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 00:39:35 +00:00
Bill Yi
aa36fa7da7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours am: f6a5f7a782
-s ours am: 6f94dadf41
-s ours am: 2c38b1f17f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I476885775321fdee9977482c47e91d7d6fb64501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 00:39:23 +00:00
Bill Yi
a6bae0a175
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours am: 9cc6bc637f
-s ours am: b894f205e4
-s ours am: 24d5554efb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I8161ddcb0dc5da6114d4092435205f27b67216b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 00:39:06 +00:00
TreeHugger Robot
bc428e6287
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d
-s ours am: a823e92625
-s ours am: 84984cfb16
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: Ib19bbe78b63c32e0a691b9e128fe9ea378ff8c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 00:31:57 +00:00
Bill Yi
0817f7d985
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00
-s ours am: bf1d22276a
-s ours am: 10de28b502
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: Ia6cd3138156970b290dbe85aaccbfe1698a9483d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 00:31:55 +00:00
TreeHugger Robot
cc281f6175
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8
-s ours am: e3b73b4216
-s ours am: 2cb99dadc0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I3339871d8f8d3886ae4c295545198b6b3b93f788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 00:31:49 +00:00
Bill Yi
202c522bae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add
-s ours am: 329b7e6713
-s ours am: de925e65b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I13301671629bcbd4ff671726876f3ee6b735291e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 00:31:39 +00:00
Daniel Sandler
4592c110e0
Merge "Launch the platform easter egg in a new task." into tm-qpr-dev am: e43bf3cd9d
am: ba81fe61cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20003711
Change-Id: I76b538e6df566b1cbd9f6f36e9813e71768bb0f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 00:30:19 +00:00
Bill Yi
c1b4909f3c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I404fe77587be7e7a199e0b638a99f8528bc55e9e
2022-09-21 17:17:45 -07:00
Bill Yi
82148a40ea
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I42f13be21657749f18b7e808ca1f6a008a38cf26
2022-09-21 17:14:58 -07:00
TreeHugger Robot
e0bbfab81c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours am: ac3b26c186
-s ours am: 870f086d09
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Idfa4618a147b8be9082d6a4452d18abc98d80e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:51:29 +00:00
Bill Yi
2c38b1f17f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours am: f6a5f7a782
-s ours am: 6f94dadf41
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I54003727fd86a627b095bdb394deef757d279ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:51:15 +00:00
Bill Yi
24d5554efb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours am: 9cc6bc637f
-s ours am: b894f205e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I707b6db35af3c6ea0f209d5886fc265dd26b9fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:50:58 +00:00
Automerger Merge Worker
a6d84a099e
Merge changes from topic "am-783809c7ca4b483db6c95715ef64a24f" into tm-qpr-dev-plus-aosp am: fdd2f017cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Icde5f1295ff62b863c62a295cb937b049a1ef79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:44:37 +00:00
TreeHugger Robot
8588f209ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours am: 323d7fa302
-s ours am: 8849c71d38
-s ours am: 61000bd01b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Id47bd2f60750ec00bd364b0bd685986975ce7c74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:44:19 +00:00
TreeHugger Robot
84984cfb16
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d
-s ours am: a823e92625
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: I015425941faa998c3d5e4379f5b862a380a18cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:24:30 +00:00
Bill Yi
10de28b502
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00
-s ours am: bf1d22276a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: I06f51912aa076a393b7d0dec0c5661ce31691ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:24:23 +00:00
TreeHugger Robot
2cb99dadc0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8
-s ours am: e3b73b4216
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I2f8488ca2488721de68a57f9998dc3b6b806d4c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:24:16 +00:00
Bill Yi
de925e65b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add
-s ours am: 329b7e6713
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: Ie0bf2a18897b7b3e78b169ae9cf7d1606b7c5648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:24:07 +00:00
Daniel Sandler
ba81fe61cf
Merge "Launch the platform easter egg in a new task." into tm-qpr-dev am: e43bf3cd9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20003711
Change-Id: I794c118911d6d2fa47ff9190a6108fc1e3d0f11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:22:53 +00:00
TreeHugger Robot
49bdf64e2e
Merge "Avoid fade animation when users switch index in hour chart." into tm-qpr-dev am: 581fd171b5
am: 4c9ca7563f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997086
Change-Id: Idbc9311f681fbeda68d28e87a7664f12bc4c53b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:18:52 +00:00
TreeHugger Robot
fb1b03f311
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours am: ac3b26c186
-s ours am: 79dbc576ec
-s ours am: bec5cc54fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I3fd86917979b7b8b6d46b5ceff604f5e269eba7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:00:39 +00:00
Bill Yi
d285f10953
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours am: f6a5f7a782
-s ours am: 3e363c0549
-s ours am: 1eff6c2155
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Iade66f872bf46ca7a26b8a7aa5cb0c3ea818a4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:00:24 +00:00
Bill Yi
567a7c5d42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours am: 9cc6bc637f
-s ours am: c2faa5ccc6
-s ours am: c35d911038
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: Ibbe049dc774c8680f77330420b08c951ee267355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 23:00:12 +00:00
Automerger Merge Worker
fdd2f017cb
Merge changes from topic "am-783809c7ca4b483db6c95715ef64a24f" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours am: 323d7fa302
-s ours am: 8849c71d38
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours am: 5d5b545e3d
-s ours am: dd99336380
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours am: f15ab25c5b
-s ours am: 5d07821c08
-s ours
2022-09-21 22:49:51 +00:00
TreeHugger Robot
4c9ca7563f
Merge "Avoid fade animation when users switch index in hour chart." into tm-qpr-dev am: 581fd171b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997086
Change-Id: If131776cab08c56c05b3e418c06730f63a21be59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:49:38 +00:00
TreeHugger Robot
61000bd01b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours am: 323d7fa302
-s ours am: 8849c71d38
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Icee67644111f7e555d8986d5caa1a2e6f947b74e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:49:28 +00:00
Bill Yi
ee31dd47de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours am: 5d5b545e3d
-s ours am: dd99336380
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I851f525e22b7403f2b4fe1825a106e9b4980b8e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:49:12 +00:00
Bill Yi
3393a72c45
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours am: f15ab25c5b
-s ours am: 5d07821c08
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: Ia338828e654f000786728a008149866bc8c7a991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:48:59 +00:00
TreeHugger Robot
7e76b60942
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d
-s ours am: ac92abd818
-s ours am: 25e883d9fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: I5ac4bddc4541da1e0183f97b7b56dc6362ddd8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:42:39 +00:00
Bill Yi
f783c81dae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00
-s ours am: ac8e5a5efd
-s ours am: 48cbbe67a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: Ie6387fd37f31902e7d8d200524c3910660b3f902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:42:37 +00:00