SongFerng Wang
874becf8e4
[automerger skipped] Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400
am: 704147041b
am: 61aa6e999d
-s ours am: 900e447543
-s ours am: b2017cb8a9
-s ours
...
am skip reason: Merged-In Ic728749112b0047cac291600b3279b9dedbf0b5a with SHA-1 8339724c21
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084
Change-Id: I4635f68a93713f96c2da7de27a473c4ba23dd98a
2022-03-17 07:07:29 +00:00
SongFerng Wang
55a2bd3870
[automerger skipped] Merge "Add the battery information into device details header" am: 907b3fc4be
am: 8ca446a175
am: 100d741cc8
-s ours am: 7c69e2951d
-s ours am: 9ed4917433
-s ours
...
am skip reason: Merged-In Ib9f4c388c369dc374c43dd399111e02b5555159b with SHA-1 57dd3bc444
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085
Change-Id: Iab2fd6630703905f177f9d66fa3581fb6c88c5ee
2022-03-17 07:06:02 +00:00
Hugh Chen
d004638343
Fix connected device detail page slice items are in smaller font size
...
- Increase font size of slice items
Bug: 223502042
Test: build pass
Change-Id: I48ac0ff9734c467cc9c1cd0fa0e2b40ea02ecfa3
2022-03-17 07:05:52 +00:00
Mattias Nilsson
aa4ac1e5b9
Do not allow editing of mcc, mnc for carrier id APNs
...
A user that is allowed to edit mcc, mnc or mvno data can break
the APN list. If a carrier or OEM has added an APN that is
matched with carrier id there is no need to edit those fields.
Apn Editor should not throw any error when a user backs out of
from a carrier id APN where mcc, mnc is empty.
Disable editing of these fields and check for carrier id APN
before adding error message.
Test: Add carrier APN, insert sim and back out from ApnEditor
Bug: 222103038
Change-Id: I4e86cdd3e8caaf3dbfefe9b9f82f11c2804577ff
2022-03-17 06:54:08 +00:00
SongFerng Wang
b2017cb8a9
[automerger skipped] Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400
am: 704147041b
am: 61aa6e999d
-s ours am: 900e447543
-s ours
...
am skip reason: Merged-In Ic728749112b0047cac291600b3279b9dedbf0b5a with SHA-1 8339724c21
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084
Change-Id: I9391e68ca6f1209862e533892231ed1b52aeb524
2022-03-17 06:33:01 +00:00
SongFerng Wang
58ba917b21
[automerger skipped] Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400
am: 704147041b
am: 61aa6e999d
-s ours am: 900e447543
-s ours
...
am skip reason: Merged-In Ic728749112b0047cac291600b3279b9dedbf0b5a with SHA-1 8339724c21
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084
Change-Id: Ie1833f926ca40f30218924d70d0e38a86da012d9
2022-03-17 06:32:28 +00:00
SongFerng Wang
b91d594441
[automerger skipped] Merge "Add the battery information into device details header" am: 907b3fc4be
am: 8ca446a175
am: 100d741cc8
-s ours am: 7c69e2951d
-s ours
...
am skip reason: Merged-In Ib9f4c388c369dc374c43dd399111e02b5555159b with SHA-1 57dd3bc444
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085
Change-Id: I9aa826724e9117a19717512954b249acc809c637
2022-03-17 06:30:59 +00:00
SongFerng Wang
9ed4917433
[automerger skipped] Merge "Add the battery information into device details header" am: 907b3fc4be
am: 8ca446a175
am: 100d741cc8
-s ours am: 7c69e2951d
-s ours
...
am skip reason: Merged-In Ib9f4c388c369dc374c43dd399111e02b5555159b with SHA-1 57dd3bc444
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085
Change-Id: I2631b7d9f52de0555d415b3d7b561cacefb401e4
2022-03-17 06:30:53 +00:00
SongFerng Wang
900e447543
[automerger skipped] Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400
am: 704147041b
am: 61aa6e999d
-s ours
...
am skip reason: Merged-In Ic728749112b0047cac291600b3279b9dedbf0b5a with SHA-1 8339724c21
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084
Change-Id: I4159419fa10d6601f1bf067751e1be95391a3426
2022-03-17 05:59:38 +00:00
SongFerng Wang
7c69e2951d
[automerger skipped] Merge "Add the battery information into device details header" am: 907b3fc4be
am: 8ca446a175
am: 100d741cc8
-s ours
...
am skip reason: Merged-In Ib9f4c388c369dc374c43dd399111e02b5555159b with SHA-1 57dd3bc444
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085
Change-Id: Ib4a5cf75d40e246f89c67b0c3f175257f71f5ce2
2022-03-17 05:58:39 +00:00
Jason Chiu
3b0a315b40
Update the default split ratio
...
Test: visual
Fix: 223300824
Change-Id: I574a6255ad0cd77cfae5da682a21408e3022df79
2022-03-17 13:52:04 +08:00
Bonian Chen
9a2fd713bf
Merge "[DataUsage] Adjusting the control of display sequence"
2022-03-17 05:36:33 +00:00
SongFerng Wang
61aa6e999d
Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400
am: 704147041b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084
Change-Id: Ieefa077cbd80848d1d8149c71dc384775a807b0d
2022-03-17 05:00:07 +00:00
SongFerng Wang
100d741cc8
Merge "Add the battery information into device details header" am: 907b3fc4be
am: 8ca446a175
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085
Change-Id: Iacf7f957deb9d3f57088c5bd49e2b0ac70cf88f8
2022-03-17 04:59:47 +00:00
TreeHugger Robot
9e8a7255ca
Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev am: 5f6aee1cf7
am: 5cf04e89a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197594
Change-Id: I8869806a8220157c5c74b946f2935bb313f1aa87
2022-03-17 04:56:42 +00:00
TreeHugger Robot
93d881598b
Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev am: 5f6aee1cf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197594
Change-Id: I019fa52c8b397ba33d900375fd2419fe0451da61
2022-03-17 04:22:09 +00:00
TreeHugger Robot
5cf04e89a1
Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev am: 5f6aee1cf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197594
Change-Id: I0923c0c5880f7a15d3bc419aab29161abc6f67fb
2022-03-17 04:21:58 +00:00
SongFerng Wang
704147041b
Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084
Change-Id: I639df2d59da6f2793bec3c89751523778f7cf35b
2022-03-17 03:52:28 +00:00
SongFerng Wang
8ca446a175
Merge "Add the battery information into device details header" am: 907b3fc4be
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085
Change-Id: Id78a0d42672ff4109449951f755ac68f169dab6b
2022-03-17 03:51:56 +00:00
TreeHugger Robot
5f6aee1cf7
Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev
2022-03-17 03:44:14 +00:00
Kate Montgomery
4473f60448
Fix settings page flicker in two ways:
...
1. On create use UiBlocker as recommended by settings team
2. On resume only update the preferences list if the system setting has
changed.
Bug: 220837804
Test: manual
Change-Id: Ieebd2e7fd74ab05d4fb73aede6868553d7d84af1
2022-03-17 03:32:03 +00:00
SongFerng Wang
cfb201c400
Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled"
2022-03-17 03:11:24 +00:00
SongFerng Wang
907b3fc4be
Merge "Add the battery information into device details header"
2022-03-17 03:11:20 +00:00
Yuri Lin
7b19287f31
Merge "Remove translatable=false from zen mode people settings footer" into tm-dev am: 9793acfafd
am: 3d19e939ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220597
Change-Id: Ic8ef4cf27414ddd2ae64b55c704efc36264150fc
2022-03-16 20:15:08 +00:00
Eric Biggers
15de9418b3
Merge "Remove support for converting from FDE to FBE" am: 804dc16a03
am: 629db5f9f8
am: c749aa3ed1
am: 6a8f883aee
am: 6b37768db4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904
Change-Id: I46632f86a9feaac618541c9563317f9039ea543f
2022-03-16 20:15:00 +00:00
Yuri Lin
3d19e939ed
Merge "Remove translatable=false from zen mode people settings footer" into tm-dev am: 9793acfafd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220597
Change-Id: Ib9c896aa646560142a6262617490eccfc0a4a7fe
2022-03-16 19:55:46 +00:00
Yuri Lin
003049ce20
Merge "Remove translatable=false from zen mode people settings footer" into tm-dev am: 9793acfafd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220597
Change-Id: Id71f9c7ac104bd1140008648308a7d62caea5b55
2022-03-16 19:55:39 +00:00
Eric Biggers
f755f6fde9
Merge "Remove support for converting from FDE to FBE" am: 804dc16a03
am: 629db5f9f8
am: c749aa3ed1
am: 6a8f883aee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904
Change-Id: Ib07f915c728fa3a00861aa14d4b3d77e3e78f173
2022-03-16 19:55:29 +00:00
Eric Biggers
6b37768db4
Merge "Remove support for converting from FDE to FBE" am: 804dc16a03
am: 629db5f9f8
am: c749aa3ed1
am: 6a8f883aee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904
Change-Id: Ie71b246a7cc9d17dabb35f6280d110db859c49a5
2022-03-16 19:55:26 +00:00
Yuri Lin
9793acfafd
Merge "Remove translatable=false from zen mode people settings footer" into tm-dev
2022-03-16 19:52:49 +00:00
Eric Biggers
6a8f883aee
Merge "Remove support for converting from FDE to FBE" am: 804dc16a03
am: 629db5f9f8
am: c749aa3ed1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904
Change-Id: I919c43559218b13c0f6188e04f104f3051a28731
2022-03-16 19:33:25 +00:00
Treehugger Robot
1fa8601a9e
Merge "Crash when scanning WiFi QR code" am: 6c31283455
am: 7950a0acaf
am: 7ada247bac
am: 64e4a57fa3
am: 7654e1fc4c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675
Change-Id: If1b4d5be4936a6b91656d5b2380f50ab6d757700
2022-03-16 19:10:01 +00:00
Yuri Lin
4d1eb0f301
Remove preference category in zen mode alarms page
...
Bug: 223295009
Test: manual
Change-Id: I7afd65519dd2db61d5d39a8e5df085ec71474775
2022-03-16 15:02:27 -04:00
Eric Biggers
c749aa3ed1
Merge "Remove support for converting from FDE to FBE" am: 804dc16a03
am: 629db5f9f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904
Change-Id: I6d5b12840e9940ecb5d076591ca8514b0085f438
2022-03-16 18:57:35 +00:00
SongFerng Wang
edac87823c
Merge "Add the battery information into device details header" into tm-dev am: 45436a025c
am: 65bf3886a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106471
Change-Id: I2c2b783cece121bf2a2dcead8c58c153f6038da7
2022-03-16 18:36:24 +00:00
Yuri Ufimtsev
ee072e47d4
Merge "Set the Refresh Broadcast ID for Safety Event if available" into tm-dev am: 829ee90dd3
am: 72f7a9f4b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197110
Change-Id: Icb1c46affa5bf55a3ca2d5e94bbb146efa104239
2022-03-16 18:36:10 +00:00
SongFerng Wang
1cd861675b
Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" into tm-dev am: 23b5565bd7
am: 58be8b3ff3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17190683
Change-Id: Ida07a57de7e1a7061b1dc0b657fc7614872414f1
2022-03-16 18:36:01 +00:00
Stanley Wang
400d221916
Merge "Fix the problem that the "Remove account" keyword has no search result." into tm-dev am: e8e0773d9b
am: ffa34e4c93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17180789
Change-Id: I6d177cbaa51eb4ae2c29c3207cd8a3f713c53fe5
2022-03-16 18:35:48 +00:00
TreeHugger Robot
758de981fe
Merge "Update animation on storage item" into tm-dev am: 2d1c853931
am: bc6229257b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17092203
Change-Id: I50b5e8fc22df8d8a681914baab98ce3fcb9dccfe
2022-03-16 18:35:33 +00:00
Jason Chiu
67e1647033
Merge "Prevent scrolling after the homepage recreating" into tm-dev am: 1c8e07438a
am: 7f850294d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148787
Change-Id: I72477eb010164d12d22b755bab1b09aeeff26b17
2022-03-16 18:35:18 +00:00
Eric Biggers
629db5f9f8
Merge "Remove support for converting from FDE to FBE" am: 804dc16a03
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904
Change-Id: Ic08831f723e777c150a672924616184af0d3299f
2022-03-16 18:34:10 +00:00
Eric Biggers
804dc16a03
Merge "Remove support for converting from FDE to FBE"
2022-03-16 18:10:30 +00:00
Yomna Nasser
16490954fb
Merge "Check KEY_PREFER_2G_BOOL before showing 2G options." into tm-dev am: 4f829146a2
am: 742e359c08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17144311
Change-Id: I6f6ddb39f6d69442b818ef8fbd4428708cd0a9a9
2022-03-16 18:08:24 +00:00
Menghan Li
e7a3f598fc
Merge "Fix no response after Talkback users double-tap on Learn more in Accessibility pages" into tm-dev am: 65bc1b40ff
am: e119b138d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17157235
Change-Id: I814e3fbb8cc55f0c801c6ff8b2dd0d379561faf4
2022-03-16 18:07:57 +00:00
PETER LIANG
3269579d69
Merge "Fix that the toggle of High contrast text doesn't change to turn off after tapping the Reset button." into tm-dev am: 9f9c2593ad
am: 171c5ecb2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17183508
Change-Id: I1ed1c9620d0875d037c0ea7cd3c2058fcc2cc435
2022-03-16 18:07:50 +00:00
Menghan Li
52e4d6efee
Merge "Minor update to the 3-button navigation steps string" into tm-dev am: 849c153afd
am: 03a4be2468
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206763
Change-Id: Ide65ddc7d5bbc19a1366bef1e8ac74a85109e963
2022-03-16 18:07:41 +00:00
Menghan Li
43d76f00d6
Merge "Not show default footer strings in accessibility settings" into tm-dev am: 4e6e4c93e1
am: 1300aa3c29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206764
Change-Id: Ia49ca70e4edb3eaa8e418e8513ee6ac139e72c3d
2022-03-16 18:04:23 +00:00
Joshua Mccloskey
2f1a91cfc0
Merge "Updated fp enrollment to have 5 enroll stages." into tm-dev am: 5b8d645a99
am: 0494709820
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17189876
Change-Id: I3c9ed711e60154e0df2b3f8d8e61675fdeff3724
2022-03-16 17:37:02 +00:00
Treehugger Robot
7654e1fc4c
Merge "Crash when scanning WiFi QR code" am: 6c31283455
am: 7950a0acaf
am: 7ada247bac
am: 64e4a57fa3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675
Change-Id: Ic370e0dc30be21fe0f112b2354c3b44bc7e835e0
2022-03-16 17:27:59 +00:00
Treehugger Robot
03ef315d89
Merge "Crash when scanning WiFi QR code" am: 6c31283455
am: 7950a0acaf
am: 7ada247bac
am: 64e4a57fa3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675
Change-Id: Ib67a5f8dddfe2f9356c127dd08c6b2079b2b9363
2022-03-16 17:27:53 +00:00