PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,603 Commits 1 Branch 0 Tags
b0f4fd347f5188efb3f46e3e93dbd49c11a6cbb5
Commit Graph

100603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b0f4fd347f Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev am: f73af73a1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980963

Change-Id: I8c36a15f8e525af25eb36fd2585371048ea89228
 2022-02-28 22:54:26 +00:00
TreeHugger Robot
f73af73a1a Merge "Enable touch feedback settings when the phone is in silent mode" into tm-dev 2022-02-28 22:46:22 +00:00
TreeHugger Robot
e9b00be6f6 Merge "Change dream icon color to be the same as the text color." into tm-dev am: 090e1d395a am: 33b385157e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015305

Change-Id: Ie08c04b7cb8ac87796101c59c7d0ec0153221e6f
 2022-02-28 22:25:20 +00:00
Yuri Lin
5a28e15e74 [automerger skipped] Merge "Revert "Rename Do Not Disturb -> Priority Mode"" into tm-dev am: bf643f9276 am: fb5cec2c79 -s ours 
am skip reason: Merged-In I7516c97809c7968f999d7caa8885f0cb5cdc844f with SHA-1 f26a246f5a is already in history

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

Change-Id: I24673e16c50f892b71d3b652fa1841d5dc3da374
 2022-02-28 22:11:33 +00:00
TreeHugger Robot
33b385157e Merge "Change dream icon color to be the same as the text color." into tm-dev am: 090e1d395a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015305

Change-Id: I8f76801f746a44d09c8f4e778d71fb55933306ef
 2022-02-28 21:16:37 +00:00
Yuri Lin
fb5cec2c79 Merge "Revert "Rename Do Not Disturb -> Priority Mode"" into tm-dev am: bf643f9276 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034508

Change-Id: Ib79d31b6d53d22c79f158a18b63f365216657353
 2022-02-28 21:13:34 +00:00
TreeHugger Robot
046da2b819 Merge "Change dream icon color to be the same as the text color." into tm-dev am: 090e1d395a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015305

Change-Id: I76f5e2980989eba92a48972f3f2abc87247bdf61
 2022-02-28 21:12:35 +00:00
Yuri Lin
5a3dc630a7 [automerger skipped] Merge "Revert "Rename Do Not Disturb -> Priority Mode"" into tm-dev am: bf643f9276 -s ours 
am skip reason: Merged-In I7516c97809c7968f999d7caa8885f0cb5cdc844f with SHA-1 32fc9d9184 is already in history

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

Change-Id: I11ee3292cecab7974f63152b9408671af80b6509
 2022-02-28 21:09:38 +00:00
Yuri Lin
69d4be55e9 [automerger skipped] Revert "Rename Do Not Disturb -> Priority Mode" am: f26a246f5a -s ours 
am skip reason: Merged-In I7516c97809c7968f999d7caa8885f0cb5cdc844f with SHA-1 32fc9d9184 is already in history

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

Change-Id: I3665330f752f34195f8ca2a42e4eb9f516355f0a
 2022-02-28 21:09:32 +00:00
TreeHugger Robot
090e1d395a Merge "Change dream icon color to be the same as the text color." into tm-dev 2022-02-28 20:41:56 +00:00
Yuri Lin
bf643f9276 Merge "Revert "Rename Do Not Disturb -> Priority Mode"" into tm-dev 2022-02-28 20:20:23 +00:00
Joe Bolinger
7a860d693e Merge "Persist state of no thanks button." into tm-dev am: 72f84a96d8 am: afc6079973 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17016922

Change-Id: I2d05514735968b3e3111964eddd79bd8f73f3d17
 2022-02-28 18:40:55 +00:00
Joe Bolinger
9b6402b1f2 Merge "Persist state of no thanks button." into tm-dev am: 72f84a96d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17016922

Change-Id: I1727426ef3b8533ee72290120cc529016345f43a
 2022-02-28 18:20:41 +00:00
Joe Bolinger
afc6079973 Merge "Persist state of no thanks button." into tm-dev am: 72f84a96d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17016922

Change-Id: I5ab77858324c3017f0f172c7be2dd78a8e3eb4a6
 2022-02-28 18:19:57 +00:00
Joe Bolinger
72f84a96d8 Merge "Persist state of no thanks button." into tm-dev 2022-02-28 18:02:28 +00:00
Yuri Lin
f26a246f5a Revert "Rename Do Not Disturb -> Priority Mode" 
Revert submission 16632971-yl-prioritymode

Reason for revert: We're not launching this change with T, so this will revert all the relevant string changes.
Reverted Changes:
I5eff72db8:Rename Do Not Disturb -> Priority Mode
Ie7a9e35e6:Rename Do Not Disturb -> Priority Mode
I7bb74d2fd:Rename Do Not Disturb -> Priority Mode
Id17942024:Rename Do Not Disturb -> Priority Mode
Ib8efd7289:Rename Do Not Disturb -> Priority Mode
Ia1b77f9ee:Rename Do Not Disturb -> Priority Mode

Bug: 190180868
Test: TH

Change-Id: I7516c97809c7968f999d7caa8885f0cb5cdc844f
Merged-In: I7516c97809c7968f999d7caa8885f0cb5cdc844f
 2022-02-28 16:33:33 +00:00
Yuri Lin
dd6cf38405 Merge "Revert "Rename Do Not Disturb -> Priority Mode"" 2022-02-28 15:57:05 +00:00
Evan Laird
c7ffca9d5a Merge "Add setting for showing the vibrate icon in status bar" into tm-dev am: 969625bc8e am: 95184c72dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986239

Change-Id: I5b14cdabc41b9093fe53423a876e5aead395e017
 2022-02-28 15:55:40 +00:00
Evan Laird
38770319fd Merge "Add setting for showing the vibrate icon in status bar" into tm-dev am: 969625bc8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986239

Change-Id: I6b8767252a2de9a3b07bac16ea1b18379fd01eb4
 2022-02-28 15:35:39 +00:00
Evan Laird
95184c72dd Merge "Add setting for showing the vibrate icon in status bar" into tm-dev am: 969625bc8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986239

Change-Id: Ife07955ce96448e9641a32c838b5178fad7a63cf
 2022-02-28 15:34:21 +00:00
Evan Laird
969625bc8e Merge "Add setting for showing the vibrate icon in status bar" into tm-dev 2022-02-28 15:10:23 +00:00
TreeHugger Robot
3d345dda13 Merge "Update dream preview button text color" into tm-dev am: 3afc9399f7 am: 5aa1a810b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015304

Change-Id: Ia3217b94aa4bc02aa7a122733eede5a7ed53ceb7
 2022-02-25 22:12:00 +00:00
TreeHugger Robot
792e514bd0 Merge "Update dream preview button text color" into tm-dev am: 3afc9399f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015304

Change-Id: I2a5a4554e4d316903679fb5bd4a322f67d75e8e9
 2022-02-25 21:49:36 +00:00
TreeHugger Robot
5aa1a810b1 Merge "Update dream preview button text color" into tm-dev am: 3afc9399f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015304

Change-Id: I0d3d60c2a8acdbaf302d6f1162cac91234ed97a5
 2022-02-25 21:49:23 +00:00
Joe Bolinger
017545c6d1 Persist state of no thanks button. 
Fix: 207724636
Test: manual (scroll to bottom and rotate device)
Change-Id: I5ef486dc49abd22387b5f6edf67eedaacc9ded4a
 2022-02-25 21:42:36 +00:00
TreeHugger Robot
3afc9399f7 Merge "Update dream preview button text color" into tm-dev 2022-02-25 21:11:19 +00:00
Aaron Liu
9a0139b7d2 Merge "Home Controls: Add Device Controls settings" into tm-dev am: 7e24127f12 am: bb197a869a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16991609

Change-Id: Iff3565d6b3833423f1a82c71b398c99f495e03b1
 2022-02-25 20:15:49 +00:00
Lucas Silva
3ebbeeb83b Merge "Allow other layouts to be passed into the dream view adatper." into tm-dev am: 7565dfb999 am: e0f4e4a55e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002670

Change-Id: I90c1fd73fbbff792b2c3a361e0376737590fef7f
 2022-02-25 20:00:14 +00:00
Lucas Silva
f939e8e1a4 Merge changes from topic "dreams-oobe" into tm-mainline-prod am: fa09bca0db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002670

Change-Id: If88d0fec8cb463691f0e4fa02d7a2570d12b083f
 2022-02-25 20:00:04 +00:00
TreeHugger Robot
f5128a5e6b Merge "[Panlingual] Fix duplicated locale show on suggested group" into tm-dev am: cfd4c68d94 am: 18582d64a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005475

Change-Id: I33d1b1091f45a5a2f7af11251869bbb5307f5cd1
 2022-02-25 19:59:54 +00:00
Lucas Silva
25c774c286 Merge "Allow other layouts to be passed into the dream view adatper." into tm-dev am: 7565dfb999 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002670

Change-Id: I7df07963c009d3afa7e4a9b83bc41586ad70a025
 2022-02-25 19:43:20 +00:00
TreeHugger Robot
39697f86e7 Merge "[Panlingual] Fix duplicated locale show on suggested group" into tm-dev am: cfd4c68d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005475

Change-Id: Ie3dda91506593620e0de659793924d9669536813
 2022-02-25 19:42:06 +00:00
PETER LIANG
d090ac2a30 Merge "Override the text size attribute of "Preview" in the text and reading options." into tm-dev am: c872615dff am: 49f772581c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16996813

Change-Id: Ifc01861df702e6e320fbad47287cbffd90491dc8
 2022-02-25 19:33:44 +00:00
Menghan Li
2e35afa0ba Merge "Refine A11y Tile Service javadoc" into tm-dev am: d3a7ec88a0 am: 8743339526 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932278

Change-Id: I3512b51a95237859f131921233dcc2709fc0eefe
 2022-02-25 19:14:40 +00:00
Lucas Silva
9548af2cc8 Change dream icon color to be the same as the text color. 
Bug: 220120729
Test: locally on device
Change-Id: I60de6ba18c0ee46fa1e578e8a7b4c68206024913
 2022-02-25 13:39:43 -05:00
Lucas Silva
5b19c1200f Update dream preview button text color 
Bug: 219761637
Test: locally on device
Change-Id: I6b98b400c31ca5a296f5ed095b52ff7d8ea36c44
 2022-02-25 13:13:59 -05:00
Aaron Liu
bb197a869a Merge "Home Controls: Add Device Controls settings" into tm-dev am: 7e24127f12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16991609

Change-Id: I368f1594f353c1da16a446d92d96e33c99b69864
 2022-02-25 16:50:13 +00:00
Aaron Liu
7e24127f12 Merge "Home Controls: Add Device Controls settings" into tm-dev 2022-02-25 16:19:30 +00:00
Lucas Silva
e0f4e4a55e Merge "Allow other layouts to be passed into the dream view adatper." into tm-dev am: 7565dfb999 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17002670

Change-Id: I91622c5abbd52a553583822df89d01ba80ed493b
 2022-02-25 15:29:04 +00:00
Lucas Silva
fa09bca0db Merge changes from topic "dreams-oobe" into tm-mainline-prod 
* changes:
  [automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3
  Allow other layouts to be passed into the dream view adatper.
 2022-02-25 15:07:20 +00:00
Lucas Silva
7565dfb999 Merge "Allow other layouts to be passed into the dream view adatper." into tm-dev 2022-02-25 15:07:20 +00:00
Lucas Silva
4d8565dfa9 Merge changes from topic "dreams-oobe" 
* changes:
  [automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3 2p: c8c07f4ac7
  [automerge] Allow other layouts to be passed into the dream view adatper. 2p: 5e91b7eab3
  Allow other layouts to be passed into the dream view adatper.
 2022-02-25 15:07:20 +00:00
TreeHugger Robot
18582d64a3 Merge "[Panlingual] Fix duplicated locale show on suggested group" into tm-dev am: cfd4c68d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005475

Change-Id: I460c9ce2fa19885e2720541982123ab4440cb8de
 2022-02-25 12:01:41 +00:00
TreeHugger Robot
cfd4c68d94 Merge "[Panlingual] Fix duplicated locale show on suggested group" into tm-dev 2022-02-25 11:31:56 +00:00
PETER LIANG
49f772581c Merge "Override the text size attribute of "Preview" in the text and reading options." into tm-dev am: c872615dff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16996813

Change-Id: I123675c76501ec062ac87c0b30897a6a379a56ec
 2022-02-25 10:30:43 +00:00
PETER LIANG
c872615dff Merge "Override the text size attribute of "Preview" in the text and reading options." into tm-dev 2022-02-25 10:06:57 +00:00
tom hsu
62a8514d1b [Panlingual] Fix duplicated locale show on suggested group 
- When User select 2 same locale but different region, current logic
   will also check 2 times and add these same results into cache.
 - Use hashSet to resolve this problem

Bug: 220804297
Test: local
Test: atest pass
Change-Id: I60c63a1eb570373fd714cf9b29ed926d15b2daa7
 2022-02-25 09:35:51 +00:00
Lucas Silva
4b3131bbf6 Merge "Add dream descriptions to dream settings UI." into tm-dev am: 4b6efee1a3 am: caa3d0c437 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989262

Change-Id: Ibe10e8d116d4caf3ccb898559b7477132d4cd5a3
 2022-02-24 23:57:01 +00:00
TreeHugger Robot
c7892b961c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours am: 50b53a1c58 -s ours am: 950a131827 -s ours am: 8838e249ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6c5820b652d33fb6f670ac7ce5d4c36529b29f0
 2022-02-24 23:56:42 +00:00
Bill Yi
b3c16ac91c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours am: 340aa20e39 -s ours am: 8b2c75107f -s ours am: 9e11adf975 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5417ce9116f4ee21949c5d5b0e85676318ac367c
 2022-02-24 23:56:39 +00:00