PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,714 Commits 1 Branch 0 Tags
df16e4b74c0958dc0713e1c967a45680ecbaf8f0
Commit Graph

24484 Commits

Author SHA1 Message Date
Xin Li
b9e9ca119c Merge sc-v2-dev-plus-aosp-without-vendor@8084891 
Bug: 214455710
Merged-In: I962c318f41adcf180b885f2052ce0ec4952edfb6
Change-Id: I77764eaf895ac3c13c7440adb5b3f597a516d690
 2022-02-11 07:29:32 +00:00
Xin Li
3160c1adb3 Merge SQ1A.220205.002 
Bug: 213904741
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: I6008378cd10c04b931186540b36c93705de6b5c8
 2022-02-07 23:19:53 -08:00
Treehugger Robot
48c90fde8a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:46:54 +00:00
Bill Yi
0b57480c1a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6f04568a54e4b9ed91a16579f210fd320e317e5e
 2022-01-10 17:06:49 +00:00
Bill Yi
87d6f1f523 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I52253a63ba60867e86c9f85474062a03155bf0aa
 2022-01-10 17:03:04 +00:00
Bill Yi
39df254c94 Merge sc-qpr1 to aosp-master - DO NOT MERGE 
Merged-In: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
Merged-In: I4f51c80cf4e32c384afad849c04c7c6afa065767
Change-Id: Ie466180309fcfe540492967e8bf3587b34928ded
 2022-01-06 18:39:02 -08:00
Stanley Wang
0bac54a0ee Merge "Restore the style of the screen saver widget from switch style to button style." into sc-v2-dev am: bfd37d65b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16512667

Change-Id: I1eb6e46632e7486bfe79cada099059e333c3906b
 2021-12-22 08:59:39 +00:00
Stanley Wang
446f6dd886 Restore the style of the screen saver widget from switch style to 
button style.

The operation of the Switch is not suitable for previewing the
screen saver and will make the user confused. So we change the
style of the screen saver widget back to the button style.

Fix: 189505023
Test: manually test the screen saver
Change-Id: I4a97d91cc0b76111d4cb7b6aa202f2207ee0ca5d
 2021-12-22 10:13:27 +08:00
Xin Li
971abb190b Merge SP1A.211205.008 
Bug: 205056467
Merged-In: I84848a2801172b46f7cc3ff39d88ad57e34514a4
Change-Id: I4227cf287bd7adffb3241954bd47284b7cd44fdf
 2021-12-20 14:15:09 -08:00
Jason Hsu
f6f978ec38 Merge "Revert "Add new string to hint user of triple-tap shortcut delay"" into sc-v2-dev am: 4ae25ef592 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16464242

Change-Id: Ie87bc598fbba95ef042b3be813801a437adeace3
 2021-12-15 06:23:47 +00:00
Jason Hsu
4ae25ef592 Merge "Revert "Add new string to hint user of triple-tap shortcut delay"" into sc-v2-dev 2021-12-15 06:11:18 +00:00
Bill Yi
d2d3da3850 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6966abfdfdbf672b27528c1761eb23b95aefe521
(cherry picked from commit ffc0ed7b89)
Merged-In:I6966abfdfdbf672b27528c1761eb23b95aefe521
 2021-12-15 00:03:06 +00:00
Yanting Yang
a36d55e8f8 Rephrase dialog message of clear storage dialog for security concern 
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620)
(cherry picked from commit 5549bf8cd0)
Merged-In:I8f0b066de710169ee8b922c44b6519ca21b9c7ef
 2021-12-15 00:02:58 +00:00
Jason Hsu
8eb2aeafa4 Revert "Add new string to hint user of triple-tap shortcut delay" 
This reverts commit dc156e77b4.

Reason for revert: New flow for magnification switch shortcut need to be fine-tuned again. Punt this flow to Android T, so revert the string.

Change-Id: Ieb48b8e3e34b96130193cf8499ff8f49e5954b1f
 2021-12-14 09:39:01 +00:00
Bonian Chen
54e4845d54 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: I9c1bd5949a1c76ef3ef97868ada3b850af5bc68e
 2021-12-14 02:30:53 +00:00
Bonian Chen
078f873ccc Merge "[Settings] Refactor Wifi Calling description text" 2021-12-14 02:09:36 +00:00
Treehugger Robot
d3548f5ac3 Merge "Set the EID in the SIM status page to be copyable" am: eba925809d am: 43c08cc42f am: 38d4bfc954 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715

Change-Id: I022e833b6ffbb07055fb52234a9ca4de0b394a22
 2021-12-13 15:26:45 +00:00
Treehugger Robot
38d4bfc954 Merge "Set the EID in the SIM status page to be copyable" am: eba925809d am: 43c08cc42f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715

Change-Id: Ib89b68b80bbfec649ddf54b50de568c94ce8d6b3
 2021-12-13 15:03:49 +00:00
Treehugger Robot
43c08cc42f Merge "Set the EID in the SIM status page to be copyable" am: eba925809d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715

Change-Id: Icbf909388b53ab1846fc2fca27c7c6bb7201a3e6
 2021-12-13 14:48:47 +00:00
Treehugger Robot
eba925809d Merge "Set the EID in the SIM status page to be copyable" 2021-12-13 14:25:11 +00:00
Bonian Chen
05836450f9 Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev 2021-12-13 14:19:44 +00:00
Bonian Chen
3900342c14 Merge "[Settings] Support phone number talkback" into sc-v2-dev am: 14d03e77ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430899

Change-Id: I4492b8cd17c4ad4b288a356722a92936d97898f5
 2021-12-13 09:46:35 +00:00
Bonian Chen
14d03e77ad Merge "[Settings] Support phone number talkback" into sc-v2-dev 2021-12-13 09:23:17 +00:00
Bonian Chen
5a36357d63 Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev-plus-aosp 2021-12-13 07:32:06 +00:00
jason thedjoisworo
5923723b4d Set the EID in the SIM status page to be copyable 
Add new textIsSelectable attributes to the EID textview

Bug: 210374141
Change-Id: I3b4f223319ee0ab8ae89dc2b0984ae9f9dbe32ae
 2021-12-13 06:39:20 +00:00
TreeHugger Robot
b944d7f110 Merge "Move the text under slider bar to the description under title" into sc-v2-dev am: 0f0e27cf6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16379115

Change-Id: I5cf2e273ae5dda74a8491a85588e795203b73c43
 2021-12-10 01:23:35 +00:00
TreeHugger Robot
0f0e27cf6a Merge "Move the text under slider bar to the description under title" into sc-v2-dev 2021-12-10 01:03:24 +00:00
Joe Bolinger
a0fcc6e18e Update remove face enrollment strings for convenience. am: 493e889dd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16433461

Change-Id: Ib3901ce16b07b3ee5d8554cc62acae5bbf4a76d6
 2021-12-09 21:23:35 +00:00
Joe Bolinger
493e889dd6 Update remove face enrollment strings for convenience. 
Fix: 209877102
Test: manual (enroll & delete)
Change-Id: Idb3a8d3622574edc47673e8fe6a72a5b9d449c7b
 2021-12-09 19:24:27 +00:00
Joe Bolinger
2782c90f66 Merge "Update enrollment edu animation." into sc-v2-dev am: e8d9c1e1d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16389834

Change-Id: I7c4794b8a5b385fc341e207384d91703a6e509af
 2021-12-09 18:38:40 +00:00
Joe Bolinger
e8d9c1e1d3 Merge "Update enrollment edu animation." into sc-v2-dev 2021-12-09 18:09:34 +00:00
SongFerng Wang
d06e52bc4b Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev am: c350919fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182703

Change-Id: I0a22265ceeab9ccddca467338ed4a43f7636f3b7
 2021-12-09 14:49:14 +00:00
SongFerng Wang
c350919fa4 Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev 2021-12-09 14:24:43 +00:00
Bonian Chen
11271df53a [Settings] Support phone number talkback 
Support phone number talkback in about phone UI pages.

Bug: 182923869
Test: local, junit
Change-Id: I159827070a954dee13230ff7cf6de81dbbaa7545
(cherry picked from commit d051e65d3c)
 2021-12-09 13:45:40 +00:00
Jason Hsu
22d79fabb6 Merge "Add new string to hint user of triple-tap shortcut delay" into sc-v2-dev am: dc0ee218e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16419877

Change-Id: I44ab328eff53752e188dd84e9284ff65686f7b64
 2021-12-09 13:16:26 +00:00
jasonwshsu
dc156e77b4 Add new string to hint user of triple-tap shortcut delay 
* Original content in magnification switch shortcut dialog needs to have
different versions for different accessibility software shortcuts. Use
this generic content to replace them.

Bug: 208749782
Test: manual test
Change-Id: Ifc6591625c92ea04f6637ecfe90ce7d7b528b295
 2021-12-09 10:00:58 +00:00
Sunny Shao
b5bb0e85a1 Move the text under slider bar to the description under title 
- Make this change after discussed with UX team.

Fixes: 206737771
Test: manual test
Change-Id: I9517933312d8db400f6d40b4124815ad275014ec
 2021-12-09 17:13:26 +08:00
Bonian Chen
5de864ae93 [Settings] Refactor Wifi Calling description text 
Refactor the display of description text when no wifi calling options available.
Enhancement:
1. These text need to align the style with the summary part of the wifi
calling options.
2. These text need to be scrollable in order to see full description.
3. The link within text need to be clickable.

Bug: 204844012
Test: local
Change-Id: I60f339bf4adf50236d80176669a557c77f0d97ca
(cherry picked from commit 8a892271da)
Merged-In: I60f339bf4adf50236d80176669a557c77f0d97ca
Merged-In: I8bbe6c653c51b8ca43d936e50166f0f8bfb1acdc
 2021-12-06 04:00:50 +00:00
Bonian Chen
ace21a81da [Settings] Refactor Wifi Calling description text 
Refactor the display of description text when no wifi calling options available.
Enhancement:
1. These text need to align the style with the summary part of the wifi
calling options.
2. These text need to be scrollable in order to see full description.
3. The link within text need to be clickable.

Bug: 204844012
Test: local
Change-Id: I60f339bf4adf50236d80176669a557c77f0d97ca
(cherry picked from commit 8a892271da)
Merged-In: I60f339bf4adf50236d80176669a557c77f0d97ca
Merged-In: I8bbe6c653c51b8ca43d936e50166f0f8bfb1acdc
 2021-12-05 15:05:53 +00:00
Joe Bolinger
c9357384d4 Update enrollment edu animation. 
Fix: 208654839
Test: manual (enroll and verify animation)
Change-Id: I1d21d3533c65f75158a9602875294fdfa6a36701
 2021-12-03 22:58:12 +00:00
Joe Bolinger
5636794cbe Merge "Remove portrait flag from handoff activity." into sc-v2-dev am: 9220a46cc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16367697

Change-Id: I46e24c353f27abf435e3f9c81aef9f35d5221277
 2021-12-03 22:35:22 +00:00
Joe Bolinger
9220a46cc2 Merge "Remove portrait flag from handoff activity." into sc-v2-dev 2021-12-03 22:13:02 +00:00
Jason Chiu
e17163adf5 Merge "Disable animations of deep link homepages to reduce the shortcut flicker" into sc-v2-dev am: 50bfe197b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16297689

Change-Id: I05f4f60f96dcc0b83cb7af76943a56a59d0fb0af
 2021-12-03 09:25:19 +00:00
Jason Chiu
50bfe197b7 Merge "Disable animations of deep link homepages to reduce the shortcut flicker" into sc-v2-dev 2021-12-03 07:01:16 +00:00
Jason Hsu
8216c769a9 Merge "Align the "Open activity" UI style with usual accessibility service "Use service"" into sc-v2-dev am: 5c90a9c225 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16321718

Change-Id: I56bfde017611f42e38d16488a5fa02f18d2db253
 2021-12-02 11:27:03 +00:00
Jason Hsu
5c90a9c225 Merge "Align the "Open activity" UI style with usual accessibility service "Use service"" into sc-v2-dev 2021-12-02 11:01:49 +00:00
TreeHugger Robot
3d8edf8e43 Merge "Fix the background color of CollapsingToolbarLayout" into sc-v2-dev am: d355d7f123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16284152

Change-Id: I2203f0844c527bf1ac7934b1d711117397ed120c
 2021-12-02 07:54:01 +00:00
TreeHugger Robot
d355d7f123 Merge "Fix the background color of CollapsingToolbarLayout" into sc-v2-dev 2021-12-02 07:19:45 +00:00
Mill Chen
3825bff021 Fix the background color of CollapsingToolbarLayout 
The wrong background color of CollapsingToolbarLayout appears in some
pages like "All apps" page or "Password and accounts" page. This symptom
can be observed in these pages when the work profile is enabled and the
line count of title is 1.

This issue is caused by updating the title of the page many times. In
these pages that have the tab view, the structure of the page differs
from a general setting page. The title of the page is coming from
BaseActivity, ProfileSelectFragment, PersonalFragment and WorkFragment,
in which the page that has the issue has an empty string from
ProfileSelectFragment. That is causing the CollapsingTollbarLayout has
the different line count during the process of setting the title.

Since the pages that have the tab view are different from the general
pages in Settings, the title should be set separately for those pages.
Adding a method to get the title resource ID so the page extending from
ProfileSelectFragment can set its title.

Bug: 192914660
Test: visual test and manual test
1) Enable work profile
2) Navigate to All apps page
3) The page should have the correct background color in the
CollapsingToolbarLayout

Change-Id: I52ef9729f3cad56161ea3d87ba25429dfcdb26ef
Merged-In: I52ef9729f3cad56161ea3d87ba25429dfcdb26ef
 2021-12-02 13:40:45 +08:00
TreeHugger Robot
1e8e39d34e Merge "Updated udfps strings" into sc-v2-dev am: d51b41d4ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16301855

Change-Id: Ifb3782076b5f3227cdfb98ba495c41ab71835e51
 2021-12-01 20:42:40 +00:00