Amy Hsu
ae9df5d621
Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
am: 156d912ce2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I3b2cc86858be209e64c8da37dd1b37552146cfd7
2020-06-15 09:00:03 +00:00
Rubin Xu
634cdf3825
Merge "Remove password shards from memory" into rvc-dev am: 01bd0fcaf7
am: 087ec3447d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838400
Change-Id: Ibb118e229475324815744c17a98b66eb33ecaa99
2020-06-15 08:59:52 +00:00
Amy Hsu
156d912ce2
Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I1a3e8410a9e31ab3fa1e324cfe6d8759ba8515c2
2020-06-15 08:45:50 +00:00
Rubin Xu
087ec3447d
Merge "Remove password shards from memory" into rvc-dev am: 01bd0fcaf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838400
Change-Id: Ie00fbd5ed4e6c1a61349cd33f55e1fb23a8f92bc
2020-06-15 08:45:39 +00:00
Amy Hsu
f9a021511e
Merge "Add Smooth Display option to developer in Settings" into rvc-dev
2020-06-15 08:39:26 +00:00
Rubin Xu
01bd0fcaf7
Merge "Remove password shards from memory" into rvc-dev
2020-06-15 08:34:18 +00:00
Bonian Chen
3b122a56d0
Merge "[Settings] WEA title wording change" into rvc-dev am: 8679724dba
am: 7e8204afee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11849344
Change-Id: Iffe586916aa14608f1169b5ba40f60763883c904
2020-06-15 08:31:12 +00:00
Bonian Chen
e017759d61
Merge "[Settings] Allow talkback to focus and select APN" into rvc-dev am: 97de75fa83
am: 687deda832
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802015
Change-Id: Id23ceb8e1c3cf91cdad7438bb4d5297010625f9b
2020-06-15 08:30:43 +00:00
Bonian Chen
1ac772c769
Merge "[Settings] WEA title wording change" into rvc-dev am: 8679724dba
am: fb59d6c860
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11849344
Change-Id: I72fcbf73f8d68adc060c3217b69bce7291b011a2
2020-06-15 08:26:22 +00:00
Bonian Chen
d27d6a98f6
Merge "[Settings] Allow talkback to focus and select APN" into rvc-dev am: 97de75fa83
am: 7830e83c12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802015
Change-Id: If674a4b7819d717efadc24f87fcfb11c9d0f4620
2020-06-15 08:26:09 +00:00
Bonian Chen
7e8204afee
Merge "[Settings] WEA title wording change" into rvc-dev am: 8679724dba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11849344
Change-Id: I988fc3e0c3be8f6a6a40338b031e364e1cbb42c1
2020-06-15 08:14:24 +00:00
Bonian Chen
fb59d6c860
Merge "[Settings] WEA title wording change" into rvc-dev am: 8679724dba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11849344
Change-Id: Iff28d0d98d20804420468b1cb3e4751f97cef6d8
2020-06-15 08:14:24 +00:00
Bonian Chen
687deda832
Merge "[Settings] Allow talkback to focus and select APN" into rvc-dev am: 97de75fa83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802015
Change-Id: Iafa4763981684ecbeaeb9988cdd6939d22c3220a
2020-06-15 08:14:15 +00:00
Bonian Chen
7830e83c12
Merge "[Settings] Allow talkback to focus and select APN" into rvc-dev am: 97de75fa83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802015
Change-Id: Ib197508a45c4b9ec9b022d1f35a5a889588c39d6
2020-06-15 08:14:11 +00:00
Bonian Chen
8679724dba
Merge "[Settings] WEA title wording change" into rvc-dev
2020-06-15 07:51:48 +00:00
Bonian Chen
97de75fa83
Merge "[Settings] Allow talkback to focus and select APN" into rvc-dev
2020-06-15 07:51:17 +00:00
tim peng
b6b9944e14
Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6
am: b4d7fe8d6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419
Change-Id: I4f3db3bb0215703e3e016daad7d2e2998dd36a6a
2020-06-15 06:55:37 +00:00
Automerger Merge Worker
d1798a413c
Merge "Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
am: 969648b937" into rvc-d1-dev-plus-aosp
2020-06-15 06:55:35 +00:00
Mark Chien
806a7b48c3
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
am: 969648b937
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: I61799d6f67f634ef465c174edb0aed465a92ff81
2020-06-15 06:55:31 +00:00
tim peng
1ed3d7c6b5
Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6
am: ae2c0de1b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419
Change-Id: I1fadfd59a30cd5392fd2eacc2433ff14431240e3
2020-06-15 06:55:29 +00:00
Automerger Merge Worker
ac3266b1be
Merge "Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
am: 52a3551a7a" into rvc-d1-dev-plus-aosp
2020-06-15 06:55:27 +00:00
Automerger Merge Worker
76fbbb8152
Merge "Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
am: ccdefc1ea5" into rvc-d1-dev-plus-aosp
2020-06-15 06:55:25 +00:00
Mark Chien
77fb97f1dc
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
am: 52a3551a7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: I7042245d05b956b28cb08aced653afaf845e77b2
2020-06-15 06:55:23 +00:00
Mark Chien
78b4bc6020
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
am: 10ef08d80f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I38b762a4ad65059c737b962e87944b5f99ffc377
2020-06-15 06:55:17 +00:00
Mark Chien
92bbd9e03b
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
am: ccdefc1ea5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: Ib7a8eee3925fb92d705b234945718b3117fc33d9
2020-06-15 06:55:17 +00:00
tim peng
b4d7fe8d6b
Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419
Change-Id: I98ea63c8fce726891bd60918be64ead454b13f52
2020-06-15 06:40:19 +00:00
tim peng
ae2c0de1b2
Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419
Change-Id: I74458ef63a9c25252efdbd16f0fbe7fd73b65baf
2020-06-15 06:40:19 +00:00
Mark Chien
969648b937
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: Ideb30fac609a33accdf40e949b63cc53ba05dfd3
2020-06-15 06:40:11 +00:00
Mark Chien
52a3551a7a
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: I50a9ff0710db37ae8513afbf876b3e7ca83fa787
2020-06-15 06:40:10 +00:00
Mark Chien
10ef08d80f
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I4e08cfb19cf7600ed8bdd42675152e518446e541
2020-06-15 06:39:59 +00:00
Mark Chien
ccdefc1ea5
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I8800bc4ae09b3ce8d318a81dbeee9afe17e57b8f
2020-06-15 06:39:57 +00:00
tim peng
e5c9b113b6
Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev
2020-06-15 06:29:32 +00:00
Tim Peng
e3a821d6fe
Unable to adjust remote session volume in Sound Setting
...
-It is incorrect to compare the device ID with session ID
-The preference key is the session ID and we should adjust remote session volume by it
Fix: 158956140
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia815b7bfdf6d7e44aca9832f11371669e973d363
2020-06-15 06:27:49 +00:00
Mark Chien
2aa2b0a2f8
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev
2020-06-15 06:23:28 +00:00
Mark Chien
49b74e24d6
Merge "Remove schedule recheck logic from TetherService" into rvc-dev
2020-06-15 06:23:11 +00:00
TreeHugger Robot
c7f5577653
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36
-s ours am: 3be94f3a54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718
Change-Id: I17b8352e4aa0a8654da55e33cd0f812760d1ec7a
2020-06-15 06:18:28 +00:00
TreeHugger Robot
32a8567521
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36
-s ours am: 4ee27b4813
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718
Change-Id: I9f868011bcb3ff3bac9680be3f12b88e6115ccde
2020-06-15 06:18:22 +00:00
TreeHugger Robot
4ee27b4813
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718
Change-Id: Ied987a5fa2dd11c2e7a0188a9efcceb8a7f4d2a6
2020-06-15 06:07:33 +00:00
TreeHugger Robot
3be94f3a54
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9ebeb21c36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862718
Change-Id: Icc77ebd01ad7d0eb7f1813a26b88b35b2cb017ee
2020-06-15 06:06:35 +00:00
TreeHugger Robot
9ebeb21c36
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-15 05:49:54 +00:00
SongFerng Wang
fcd0677370
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
am: 58d36c2d48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: Ic51904ec93d5ed3417bb81b3d67c8f7b1ddb1dab
2020-06-15 03:18:55 +00:00
Automerger Merge Worker
348ff2c535
Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: af13156dea" into rvc-d1-dev-plus-aosp
2020-06-15 03:18:50 +00:00
SongFerng Wang
24d6bb3ed0
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
am: d32cb38e45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: Ie3b090330bc2114a67e9229060ba5c6e23b74347
2020-06-15 03:18:41 +00:00
Automerger Merge Worker
f9cf45fa07
Merge "Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: 14da7dd1fa" into rvc-d1-dev-plus-aosp
2020-06-15 03:18:38 +00:00
Yanting Yang
7cd514eb49
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: af13156dea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: I29b79a9e4ca14dd1d77b4c039afffc44d4ff40e4
2020-06-15 03:18:35 +00:00
Yanting Yang
70a20ad328
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: 14da7dd1fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: I9e15289b31778b138f1668bcf556e650635c621e
2020-06-15 03:18:31 +00:00
TreeHugger Robot
c051e4830c
[automerger skipped] Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
am: d452bfdfdc
-s ours
...
am skip reason: Change-Id I625ca76298ed549dbed76d398aea0c957c9102fc with SHA-1 924e9e39c1
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224
Change-Id: I1a500b7b916db88e158d9eb1fc2256b10f7367f5
2020-06-15 03:18:27 +00:00
TreeHugger Robot
9cc918849c
Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
am: 051df5910e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224
Change-Id: Ie3357deaaa46e7a2172f9760b77321bd3705bc83
2020-06-15 03:18:21 +00:00
Bonian Chen
3e8425468b
[Settings] WEA title wording change
...
The wording of WEA need to align in UI entry and UIs within.
The "Wireless Emergency Alerts" should be the official wording for it.
Bug: 158498436
Test: build pass
Change-Id: I17e6659915e1038c8ab11ad4003c08f87bbdb82e
2020-06-15 03:16:15 +00:00
SongFerng Wang
58d36c2d48
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: If6fbc2d5b6e82fedbb3f41ce7c11301491fd0c70
2020-06-15 03:12:27 +00:00