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

101003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
c248a78d60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c0abe010c1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207460

Change-Id: Ibeb1504a463f242b1e36a1f337cb77711dec4a23
 2022-03-18 02:41:45 +00:00
Bill Yi
39de788383 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e46d423191 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207460

Change-Id: I45301965843deafdf9ae3e7cbc3b51bd7504d117
 2022-03-18 02:41:44 +00:00
Bill Yi
c0abe010c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-18 02:22:19 +00:00
Kate Montgomery
d9e8d4e5cd Merge "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." into tm-dev am: 798a0fab9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17219772

Change-Id: I5e19c1ec324bb099b0a5d966cb2fd934393c28e7
 2022-03-17 19:45:15 +00:00
Kate Montgomery
798a0fab9c Merge "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." into tm-dev 2022-03-17 19:14:04 +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
cbc67a41a0 Merge "Remove preference category in zen mode alarms page" into tm-dev 2022-03-17 15:17:31 +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
8b096f0400 Merge "Reduce gap above user list in multiuser settings." into tm-dev 2022-03-17 09:58:09 +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
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
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
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
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
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
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
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
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
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
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
64e4a57fa3 Merge "Crash when scanning WiFi QR code" am: 6c31283455 am: 7950a0acaf am: 7ada247bac 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675

Change-Id: I02f6d022aff0740281e53d208809ca9a3b10860c
 2022-03-16 17:03:37 +00:00
Treehugger Robot
7ada247bac Merge "Crash when scanning WiFi QR code" am: 6c31283455 am: 7950a0acaf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675

Change-Id: I8e31258422049429a0059159e47930c500f41ecd
 2022-03-16 15:53:31 +00:00
Treehugger Robot
7950a0acaf Merge "Crash when scanning WiFi QR code" am: 6c31283455 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675

Change-Id: I0cb7773fe6c35a5d46588a64d416d5db50d9eecb
 2022-03-16 15:29:30 +00:00
Treehugger Robot
6c31283455 Merge "Crash when scanning WiFi QR code" 2022-03-16 15:03:41 +00:00
Yuri Lin
f3eda672e3 Remove translatable=false from zen mode people settings footer 
Change-Id: Ic66112a48c8fdf5634131462f8715686cd35247b
Fixes: 223927961
 2022-03-16 14:57:59 +00:00
Oli Lan
5f56a273c4 Reduce gap above user list in multiuser settings. 
This fixes a large gap above the user list, which occurred because
a PreferenceCategory was used for this with a blank title.

Bug: 224659273
Test: Install and inspect
Change-Id: I82c4491cc6a5111c6517b2845b44632e0859e1b6
 2022-03-16 14:57:00 +00:00
Tsung-Mao Fang
56e9b25b5f Set higher priority for ADD_DEVICE_ADMIN intent 
Settings should set android:priority of the intent-filter > 1
so that regular apps can't provide an alternative.

Test: Rebuilt apk
Fix: 197960672
Change-Id: Ic12db4fa5e6a5f803930deba2a81254c375403df
 2022-03-16 18:03:40 +08:00
SongFerngWang
b76eb99d4a Add the battery information into device details header 
Add the new LE audio header
Add the battery information
Update the condition for non-LE audio header

Bug: 218626547
Test: build pass and manualy test
Change-Id: Ib9f4c388c369dc374c43dd399111e02b5555159b
Merged-In: Ib9f4c388c369dc374c43dd399111e02b5555159b
 2022-03-16 18:00:50 +08:00
SongFerng Wang
65bf3886a9 Merge "Add the battery information into device details header" into tm-dev am: 45436a025c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106471

Change-Id: Ibf05f749597fd931a67f3f2fa117223a5e93c70b
 2022-03-16 09:54:53 +00:00
SongFerngWang
e7c89d616a [LE]Gray out the a2dp and hfp when LeAudio is enabled 
1.Gray out the a2dp and hfp when le audio is enabled
2.When the user disables le audio, then the settings turn on the
  a2dp and hfp
3.When the user enables le audio, then the settings turn off the
  a2dp and hfp

Bug: 218626162
Test: build pass.
Change-Id: Ic728749112b0047cac291600b3279b9dedbf0b5a
Merged-In: Ic728749112b0047cac291600b3279b9dedbf0b5a
 2022-03-16 17:51:22 +08:00
SongFerng Wang
45436a025c Merge "Add the battery information into device details header" into tm-dev 2022-03-16 09:44:42 +00:00
Yuri Ufimtsev
72f7a9f4b6 Merge "Set the Refresh Broadcast ID for Safety Event if available" into tm-dev am: 829ee90dd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197110

Change-Id: I570e5c41206349044f579c9363b2e177189ffbf1
 2022-03-16 09:42:54 +00:00