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

101022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
c2c8dd5df2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours am: 6adefff78e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1405f0de1cb12e5741ab0b6229e90b9ecfd88d6
 2022-03-18 02:59:44 +00:00
Bill Yi
6adefff78e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia844d632034948b5cc99ee21caaab7d9fe4ebccc
 2022-03-18 02:51:27 +00:00
Bill Yi
298650d578 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -s ours am: 78abbdb6e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39ad518cab69d6f0fb1d2f24cec5b319f4264dfc
 2022-03-18 02:44:34 +00:00
Bill Yi
e786c64db4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9a68c077f -s ours am: 572d0be27b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia57c9ca2bacd69b8280bdf75e6b5cfe32720fdeb
 2022-03-18 02:44:32 +00:00
Bill Yi
feefbaaec9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0980b77d42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc9008e8b93aca4ac7f5788adfb3efe7a7add812
 2022-03-18 02:44:09 +00:00
Bill Yi
78abbdb6e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3756535e8433e4f0826f4b5f8b61abf778cc495
 2022-03-18 02:44:06 +00:00
Bill Yi
572d0be27b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9a68c077f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26049202d9fc95dfb5aec181debd9bf690972a2d
 2022-03-18 02:44:00 +00:00
Bill Yi
c353618b2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1575c5762c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddee08f13235485231e96c4331c080f44e3a1d89
 2022-03-18 02:43:53 +00:00
Bill Yi
e3385a5bc8 Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev am: 2d8cc15ec7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206624

Change-Id: Ia84f0a481eec762aa0342dbb49ae0df604b58267
 2022-03-18 02:43:29 +00:00
Bill Yi
ee1c029095 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 50710ebebc am: 33db44bfe7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I758a1030f9798dbaecbc17a00633ec264a7cabc9
 2022-03-18 02:43:27 +00:00
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
18cb77b66a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-03-18 02:25:45 +00:00
Bill Yi
0980b77d42 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-18 02:22:50 +00:00
Bill Yi
2d8cc15ec7 Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 50710ebebc
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:22:40 +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