PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,853 Commits 1 Branch 0 Tags
1aa06e3defbdf0bf47b12f63ccdaeb85c96ae425
Commit Graph

104853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
1aa06e3def [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours am: e2f0df2e2b -s ours am: fba53c2569 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If24623272f61cb4414c7ddd7be84f80b7307378f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 22:45:26 +00:00
Bill Yi
fba53c2569 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours am: e2f0df2e2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05e379c071f17ba69facf60f301a46a5e9a018e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 22:20:51 +00:00
Bill Yi
e2f0df2e2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b7bd4377446fe3aa6ff6f45ffeabbec177f243d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 21:52:59 +00:00
Bill Yi
6fcdbbeac5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccbbd4929788c7a64c6b3aeb9a318684054eb07e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 21:29:09 +00:00
Bill Yi
441b939fdb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f8009a8a13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4107999026e302ca9745fc107c79868c6e6cb2b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 20:18:03 +00:00
Bill Yi
6c24a77a6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6d15f05d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4078cf7c1ee0138e810b24583d4b4bc90bffcfb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 20:17:34 +00:00
Bill Yi
7dd0963f58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6e3dbf4e89 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c2ae5a5a950bd1c311bd8b4b2ceafa7c824fb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 20:17:15 +00:00
Bill Yi
eb215294d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9381013a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3bfacb3b22077d5e2ad427f40abb48bb1ed8e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 20:16:59 +00:00
Bill Yi
f8009a8a13 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-21 19:20:03 +00:00
Bill Yi
6e3dbf4e89 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-21 19:20:03 +00:00
PETER LIANG
3e01d3ba27 Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev am: 8c78bad4e6 am: 73dcf5c0f0 am: 483b735da8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886043

Change-Id: I05e424213ad6e12b209802578a159714ee38eac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 16:59:32 +00:00
PETER LIANG
483b735da8 Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev am: 8c78bad4e6 am: 73dcf5c0f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886043

Change-Id: Ia8246891c13f375cd3655f3432bdab967ac469de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 16:43:14 +00:00
PETER LIANG
3360338081 Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev am: 8c78bad4e6 am: 8242402834 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886043

Change-Id: Ia62ea383c3c8cbb32a62f592cf645b8b5df4f83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 16:42:53 +00:00
PETER LIANG
73dcf5c0f0 Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev am: 8c78bad4e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886043

Change-Id: I03f2f2ef3ff5f65c0a3b714abbdd090af8396d8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 16:20:14 +00:00
PETER LIANG
8242402834 Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev am: 8c78bad4e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886043

Change-Id: I4de70cc4063af21a3263c0a0e5f32e10912241b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 16:19:19 +00:00
PETER LIANG
8c78bad4e6 Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev 2022-04-21 16:06:44 +00:00
Menghan Li
00e4cec078 Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f am: 86b7b541c8 am: c79146f0e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333

Change-Id: I9c8b33cce94305bda200404ad73a1080c18bcd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 13:57:43 +00:00
Menghan Li
9ce35ab472 Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195 am: 3209314649 am: d80402cb69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944

Change-Id: I1b15efc23639c04b35206bf90f739f195978e086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 13:57:35 +00:00
Menghan Li
c79146f0e4 Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f am: 86b7b541c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333

Change-Id: Ia07708a483017cf91aca1d2ad873a1eb154a249c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 13:42:02 +00:00
Menghan Li
d80402cb69 Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195 am: 3209314649 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944

Change-Id: I2dbf2925d57a3cc7fef3708fc365f0c437d187ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 13:41:56 +00:00
Menghan Li
c8ad8d1095 Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f am: d14121e919 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333

Change-Id: I1326f80afb4db7ac3dbce3b44bf93b9138a813e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 13:41:44 +00:00
Menghan Li
ec2bf30db9 Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195 am: be78d76b8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944

Change-Id: I693b7b52baf23cf0980b41766a9d0179e1856920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 13:41:26 +00:00
Menghan Li
86b7b541c8 Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333

Change-Id: I6a57775ebb2b49067e6488c8f9526d069abc9ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 13:25:23 +00:00
Menghan Li
3209314649 Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944

Change-Id: I85691ff2e25e3fc10ccec6d5e09cdfb864655752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 13:24:58 +00:00
Menghan Li
d14121e919 Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333

Change-Id: I490ca541e33e0c65ecac53700c2d248fcd496f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 13:24:29 +00:00
Menghan Li
be78d76b8b Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944

Change-Id: I76c9b76862f6a9c416acbc83f434610f18f69c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 13:24:00 +00:00
Menghan Li
1ce6beb80f Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev 2022-04-21 13:06:30 +00:00
Menghan Li
2090748195 Merge "Fine tune Caption size and style preview height for tablet" into tm-dev 2022-04-21 13:06:13 +00:00
Bonian Chen
7d5161b850 Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" 2022-04-21 12:44:45 +00:00
TreeHugger Robot
33ad77a4d3 Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb am: c3ea2c20d2 am: 5ff02d62de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345

Change-Id: Ia256d762b0d63b0ca109a372abf68f7bc3ad4654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 10:03:54 +00:00
TreeHugger Robot
5ff02d62de Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb am: c3ea2c20d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345

Change-Id: I5015dec25f994cce0193da3c9a87c14a94dc3593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 09:41:40 +00:00
TreeHugger Robot
b27eb37231 Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb am: 6e1d390e2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345

Change-Id: I48e80addbe4c53a59a437ebd13d04f0e80683476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 09:31:47 +00:00
menghanli
d44da3b959 Fine tune Caption size and style preview height for tablet 
Root cause: We introduce the material design illustration in Android S. The most of illustration preview height is 300dp, but the SubTitleView preview keep 200dp in the phone and 150dp in tablet. The value is defined in 2017.
Solution: Align material design illustration height which looks a lot closer to an actual video, without pushing too much content below the screen.

Bug: 227264630
Test: Manual testing
Change-Id: I1a9040f50dfb6fb95c1cadbe4e7e4d24ff8ab058
 2022-04-21 17:24:37 +08:00
TreeHugger Robot
c3ea2c20d2 Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345

Change-Id: Ifa819b3296a90f9b15ff0246ada10530fb6534db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 09:18:20 +00:00
Neil Fuller
3d0fd9fc08 Merge "Fix logic used for auto time zone settings" into tm-qpr-dev am: 131d297dbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17819250

Change-Id: I903322122213f13701173ed55adf9cb30743e2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 09:16:34 +00:00
TreeHugger Robot
6e1d390e2f Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345

Change-Id: I56837b44d3a33b846fe1e44ea969cc3166081360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 09:15:53 +00:00
Peter_Liang
7f67e278ca Fine-tune the location and style of the reset button in the “Display size and text” page. 
Bug: 222419452
Test: manual test
Change-Id: I9099f13c715ce29cce8d52f6ca9cc47a4fa22306
 2022-04-21 17:09:10 +08:00
menghanli
0d47c548d9 Fix Live Caption does not follow caption size if caption is not enabled 
Root cause: Changing captions style without turning on the preference WHILE Live Caption is running works when it shouldn't.
Solution: Turn on the show caption if users change caption size and style by UX suggestion.

Bug: 221051127
Test: Manual testing
  1. Turning on/off Live Caption and Caption Manager
  2. Changing styles when Caption Manager is off
Change-Id: Ie6cfb9e0b7325c2e469ac8b6a7d359b843cc173a
 2022-04-21 17:01:15 +08:00
Neil Fuller
131d297dbd Merge "Fix logic used for auto time zone settings" into tm-qpr-dev 2022-04-21 08:33:06 +00:00
TreeHugger Robot
a7e03159cb Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev 2022-04-21 08:07:49 +00:00
Bonian Chen
7c5259efad [Settings] Code refactor for combining TelephonyCallback with Lifecycle 
This is a helper class which may support monitoring the
TelephonyCallback under the condition of Lifecycle state STARTED or
RESUMED.

Bug: 229689535
Test: unit test
Change-Id: I6d26bee604d9559e207e107b2f26583f700f8e0a
 2022-04-21 11:04:44 +08:00
PETER LIANG
7ced1f7171 Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba am: 01655dec4f am: b68aa851ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266

Change-Id: I4c089ea50c078650865d05b5ce6df814c167b5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 02:50:29 +00:00
PETER LIANG
8590f061e8 Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c am: 9e608223e2 am: e12ddd0efb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268

Change-Id: I934dee17e2657d22b8b856873654cec17b1329b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 02:50:21 +00:00
PETER LIANG
b68aa851ea Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba am: 01655dec4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266

Change-Id: I18239a84c15f1c9ea078afe885533a8983adc619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 02:32:23 +00:00
PETER LIANG
e12ddd0efb Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c am: 9e608223e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268

Change-Id: I87eddeac1b52dffbffacf9278780fef676dff09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 02:32:17 +00:00
PETER LIANG
4c4e06bf4e Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba am: a70eecc2b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266

Change-Id: Id49cce5ab448b64a6a6cf12e9136d7591d0db440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 02:31:50 +00:00
PETER LIANG
3bdd82f75b Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c am: 50a6b46f51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268

Change-Id: I939a5bde83a2e23aa1c20b5e726a974e6c648b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 02:31:28 +00:00
PETER LIANG
01655dec4f Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266

Change-Id: Ia6502d8639ef27d0a70a10217797a39dfe9dff47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 02:04:14 +00:00
PETER LIANG
9e608223e2 Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268

Change-Id: I04cd5142410af1d2d948cc33abe0c83ea8f4900b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 02:04:00 +00:00
PETER LIANG
a70eecc2b3 Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266

Change-Id: Iad200b4be8e8f4e819f60e431f9b0cb7e35da1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-21 02:03:21 +00:00