PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,504 Commits 1 Branch 0 Tags
d5f6bde3f2f36ab8be224742dfdcef68583f8d83
Commit Graph

101504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuri Lin
d5f6bde3f2 Merge "Remove preference category in zen mode alarms page" into tm-dev am: cbc67a41a0 am: a7fcd55623 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17224572

Change-Id: I8aa73de194835983d45408f8ecacde916284430f
 2022-03-17 16:31:21 +00:00
Yuri Lin
a7fcd55623 Merge "Remove preference category in zen mode alarms page" into tm-dev am: cbc67a41a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17224572

Change-Id: Ia83c5204d6a42f472f480cb71c06a44e1e4c9cd4
 2022-03-17 15:58:56 +00:00
Yuri Lin
d9414ee1b5 Merge "Remove preference category in zen mode alarms page" into tm-dev am: cbc67a41a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17224572

Change-Id: I6b0aa6c6fea35265104906401ce4a8e638be60be
 2022-03-17 15:57:19 +00:00
Yuri Lin
cbc67a41a0 Merge "Remove preference category in zen mode alarms page" into tm-dev 2022-03-17 15:17:31 +00:00
Oli Lan
ede86dbb21 Merge "Reduce gap above user list in multiuser settings." into tm-dev am: 8b096f0400 am: 3c322441b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17221043

Change-Id: I7ae4846475bd18b505e8b38c81f55475b78a8d5d
 2022-03-17 11:00:26 +00:00
Oli Lan
3c322441b0 Merge "Reduce gap above user list in multiuser settings." into tm-dev am: 8b096f0400 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17221043

Change-Id: I5b565e13df90d73cec0b4d70159502da8c75fff4
 2022-03-17 10:26:55 +00:00
Oli Lan
0a930a6ae7 Merge "Reduce gap above user list in multiuser settings." into tm-dev am: 8b096f0400 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17221043

Change-Id: I6862bc73e008def7eeabca63681b7cfd2df72c41
 2022-03-17 10:26:52 +00:00
Oli Lan
8b096f0400 Merge "Reduce gap above user list in multiuser settings." into tm-dev 2022-03-17 09:58:09 +00:00
Tsung-Mao Fang
c2e5d84257 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8 am: 469e484b37 am: 5451480da8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I94fc1c73d7c80e66f09e798dc167ecc0ed71d09d
 2022-03-17 09:55:48 +00:00
Jason Hsu
886e25a183 Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev am: f8f1ff2594 am: 0534243168 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17217203

Change-Id: I557316d7a074d7157d8726dc7b2500196d13de98
 2022-03-17 09:55:29 +00:00
Tsung-Mao Fang
a3e7f3dbac Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8 am: 469e484b37 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I07a98c4f687a5d3623a82edddbcf854b517cdeb7
 2022-03-17 09:23:10 +00:00
Tsung-Mao Fang
5451480da8 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8 am: 469e484b37 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: Ibb62d41b1bc6df4d0de6db1ad5f076c1f79d95cf
 2022-03-17 09:21:18 +00:00
Jason Hsu
b00938910e Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev am: f8f1ff2594 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17217203

Change-Id: I4aa54b397fd73f38c24f33ad5feb5aeefbbb0f30
 2022-03-17 09:20:55 +00:00
Jason Hsu
0534243168 Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev am: f8f1ff2594 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17217203

Change-Id: I70f3a3d01359dbdaca501ccb90778e0e6dcc7211
 2022-03-17 09:20:53 +00:00
Tsung-Mao Fang
469e484b37 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I64c0a288da45a3b2ef6fe3297e9b7c148a045d87
 2022-03-17 09:20:50 +00:00
Jason Hsu
f8f1ff2594 Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev 2022-03-17 08:46:50 +00:00
Tsung-Mao Fang
7052d53fd8 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I48bad553fd360ab51329e70a9857683014690743
 2022-03-17 08:46:38 +00:00
Tsung-Mao Fang
31c02007ef Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I1797a32fe9037755a699c3d402d69d4d557c27c3
 2022-03-17 08:14:09 +00:00
Tsung-Mao Fang
19d06e79b9 Merge "Settings: only set phone number if it's not empty" 2022-03-17 07:35:42 +00:00
Daniel Huang
05a975c814 Merge "[Panlingual] Handle onLocaleSelected." 2022-03-17 07:15:49 +00:00
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
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
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
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