Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,963 Commits 1 Branch 0 Tags
46fc8079ddca7afbf9c9968202451a4aeb211f72
Commit Graph

24032 Commits

Author SHA1 Message Date
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
Xin Li
971abb190b Merge SP1A.211205.008 
Bug: 205056467
Merged-In: I84848a2801172b46f7cc3ff39d88ad57e34514a4
Change-Id: I4227cf287bd7adffb3241954bd47284b7cd44fdf
 2021-12-20 14:15:09 -08: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
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
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
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
Bonian Chen
010306644b [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: Ie89a5b65e75cdd61fab68c6e1bf7c40bfcc68b6b
 2021-11-30 13:57:56 +00:00
Alice Kuo
f0b73dade7 Show the multiple Mac address for the coordinated set am: 9f11a4cddf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I9a8a0fe9d95a4ff4adc0599ce4c9a35501968f71
 2021-11-29 02:29:29 +00:00
Alice Kuo
5d1aee76c2 Add the pairing string for CSIP supported device am: f57f720c38 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I809634c657558da125e72bb1fcbddaf3db46a093
 2021-11-29 02:29:27 +00:00
Alice Kuo
9f11a4cddf Show the multiple Mac address for the coordinated set 
Show the mac address for all the devices if the device detail combine
with the multiple connections based on CSIP.

Screenshot: https://screenshot.googleplex.com/qQjc2pxNTr3tMUV

Bug: 178981521
Test: pair with the coordinated set, and check the UI
Change-Id: I01e0ec91e5c856481318d6435d174b5a2018d820
Merged-In: I01e0ec91e5c856481318d6435d174b5a2018d820
 2021-11-26 13:21:48 +08:00
Alice Kuo
f57f720c38 Add the pairing string for CSIP supported device 
Show the pairing dialog with the hint message
that pairing this device will pair all of the
set member of a coordinated set. If the device
supports CSIP, the message will be shown.

Screenshot: https://screenshot.googleplex.com/8WcrdgBoLRgJjHs

Bug: 178981521
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BlueotohPairingDialog
Change-Id: I5432b7264652dd4485e2669f6004caa4f7459238
Merged-In: I5432b7264652dd4485e2669f6004caa4f7459238
 2021-11-26 13:13:25 +08:00
Bill Yi
7f0320483c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idf72f0b25491f38f592613b85cd7e20c5935681a
(cherry picked from commit 52146b1b0a)
Merged-In:Idf72f0b25491f38f592613b85cd7e20c5935681a
 2021-11-24 23:23:38 +00:00
Bill Yi
eaf56ad8fe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0dd09e87e7a2116b4ad5bbc03462b30e786cdd07
(cherry picked from commit 8a603688a7)
Merged-In:I0dd09e87e7a2116b4ad5bbc03462b30e786cdd07
 2021-11-24 23:23:32 +00:00
changbetty
435c3385f6 For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off 
Bug: 202323013
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4a26ec43bb7e1758b8170a7ff9fa7d5846cb4a35
(cherry picked from commit bfd3020038)
 2021-10-15 21:33:24 +00:00
changbetty
565d44c4f8 Add String for information about Wi-Fi scanning when Wi-Fi is off. 
Bug: 202323013
Test: make
Change-Id: I22618a57bfecd02508f2d4a53ff6c65071de2fd1
(cherry picked from commit b7509a3079)
 2021-10-15 21:33:14 +00:00
Bill Yi
9b8ef1b7ae Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If65120e7b71d5ea69ec91f72077de3c4b45b287b
 2021-10-08 20:07:13 +00:00
Bill Yi
98f9ed5934 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia9a8641798558c7df5e1d65aadaf5ca9f15fc080
 2021-10-07 02:37:16 +00:00
Bill Yi
a516da5761 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0590d5697883acc61ef586054d1ceb0820162159
 2021-10-05 01:44:34 +00:00
TreeHugger Robot
da8e9c1108 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-02 06:34:33 +00:00
Bill Yi
41533a64d6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9a5eb92a2e472ba7faca95791c4b748f71c20a58
 2021-10-02 04:46:24 +00:00
TreeHugger Robot
6d4c35933c Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15952458

Change-Id: I5d3ee4751264b436a3e1bc9d9ff7f90037a92102
 2021-10-01 23:44:05 +00:00
Sunny Shao
f25e8aa74c Add more info on the dialog of AllowBindAppWidgetActivity 
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.

Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
Merged-In: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
(cherry picked from commit 1564ef5ca1)
 2021-10-01 05:45:49 +00:00
Bill Yi
069684e925 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5025bf1696bea34629632b29351fc463f33ef27d
 2021-09-28 09:04:57 +00:00
Bill Yi
49ce6473d6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7c1879f0724a02c587b898e68ef9161871561431
 2021-09-26 04:38:29 +00:00
TreeHugger Robot
de59a250f8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-24 16:32:45 +00:00
TreeHugger Robot
f337947e27 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-24 16:32:43 +00:00
TreeHugger Robot
59461a5836 Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168

Change-Id: I869ee6339bce5342b023ca65bba44afc9e594a68
 2021-09-24 05:54:39 +00:00
TreeHugger Robot
cc1cc9a5f7 Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev 2021-09-24 05:44:36 +00:00
Bill Yi
69f3bf31bd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie4986612ba1ce3d84272be69628dcbea8cb85b66
 2021-09-23 18:09:03 +00:00
Bill Yi
c6385601c3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4806e38ef45bc012fb2f9c1f53f999530b48eb46
 2021-09-23 17:55:55 +00:00
Tsung-Mao Fang
b57265fa31 Revert "Move Automatic System Updates from Developer Options to ..." 
Revert submission 15552651-cherrypick-automatic-system-update-n9jr24y6ba

Reason for revert: Legal team decided to have this entry in GMS, so we can move this setting item back.
Reverted Changes:
Iaea3e11d9:Move Automatic System Updates from Developer Optio...
I077607a6a:Move Automatic System Updates from Developer Optio...

Change-Id: If000388f2dd0f9e3e06a29dcbdd362181d1bfd47
Bug: 196297425
 2021-09-23 09:26:58 +00:00
TreeHugger Robot
1fc8de7343 Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410

Change-Id: If671b194ea453ac406f280b5fdfe72d62cf1f550
 2021-09-22 09:21:58 +00:00
TreeHugger Robot
85d20f5957 Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev 2021-09-22 09:08:25 +00:00
Joshua Mccloskey
8aeeb6cd45 Merge "Updated settings preference title for work profile" into sc-qpr1-dev am: 21ad438f6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15848923

Change-Id: Ib9d449b5e3b4565a6bad54141ccad8491bfb6630
 2021-09-21 22:52:34 +00:00
Joshua Mccloskey
21ad438f6a Merge "Updated settings preference title for work profile" into sc-qpr1-dev 2021-09-21 22:39:56 +00:00
TreeHugger Robot
a82b6cd01e Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730

Change-Id: I211127b96a7f675dcf7b907d261a19d1311b33ea
 2021-09-20 19:41:51 +00:00
TreeHugger Robot
9dbe775faa Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev 2021-09-20 19:19:54 +00:00
TreeHugger Robot
e9200b19ad Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-20 06:19:10 +00:00
Bill Yi
62814d9f22 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6b0a170a252a9de2623da7a47afc456806c8b491
 2021-09-18 17:24:49 +00:00
Bill Yi
918492ab2a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5565d21fd52770ff7a0a72e0eee23373b5bbb9cd
 2021-09-18 17:12:15 +00:00
Joshua Duong
c960e8973a Fix QR code scanner layout in "Pair devices over Wi-Fi" page. 
The toolbar needs to be disabled to remove the empty space at the top
of the page. Also added the landscape layout xml.

Bug: 193602141
Test: atest SettingsUnitTests and manual

Change-Id: I30368835979b360a8f09e16f70adf57064784517
(cherry picked from commit fd009229e5)
 2021-09-17 15:36:32 +00:00
TreeHugger Robot
b96d734511 Merge "Shrink notification history views to fit" into sc-qpr1-dev am: 2e16b4a07d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15846400

Change-Id: Id787a8b926cb5efdbdba91186135b5fd28fda743
 2021-09-17 13:41:36 +00:00
Joshua Mccloskey
9f7c4cedea Updated settings preference title for work profile 
Test: Verified string apperas in regular work settings.
Fixes: 193258818
Change-Id: I89671820a0bf900014567087e1e553e3ad7fe472
 2021-09-17 02:07:53 +00:00