Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,368 Commits 1 Branch 0 Tags
eb9ec7f6640e359bbcbfbf3a575c9ca7287bd718
Commit Graph

20746 Commits

Author SHA1 Message Date
Peter Wang
447fc31966 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c am: e74a04b3a8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838

Change-Id: I7a0a8993fbadd72cfe1dfb16879fb235b67ff007
 2021-03-24 19:32:58 +00:00
Peter Wang
66fd9dbad2 Added an option in reset menu in Settings to enable resetting Euicc data 
only

Bug: 159650638
Fix: 159650638
Test: Local
Change-Id: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
Merged-In: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
 2021-03-17 15:47:48 -07:00
Meng Wang
3b19347431 Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03542ee476ebff7bfae2a8f54894f00f69578744
 2021-02-25 00:44:42 +00:00
Meng Wang
0b31d30218 Merge "Use string "Carrier settings version"" am: 2161d17f32 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cbb0cd3d4c4726587082ecc4cbbfa2957e60467
 2021-02-25 00:10:09 +00:00
Meng Wang
3f9db799e5 Use string "Carrier settings version" 
.. instead of "Settings version".

Bug: 160843335
Change-Id: Ie98b9f2c62627c1e34dfa807357625b483577305
Test: make
 2021-02-24 21:15:08 +00:00
Xin Li
ad3fa60e26 Merge ab/7061308 into stage. 
Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
 2021-02-21 09:25:11 -08:00
Alex Salo
76190cf069 Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment" am: d1b9b7f87f am: 72dad8bc9d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1552081

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae883594bbcf485c096b77152a82154b3caafdef
 2021-02-05 01:27:56 +00:00
Alex Salo
72dad8bc9d Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment" am: d1b9b7f87f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1552081

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafddf0eb17f24f4b0c845411092ed8c6c36fbbd5
 2021-02-05 00:25:15 +00:00
Abel Tesfaye
2babd2d36a Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment 
Test: locally with phone
Change-Id: I73663cd3e9e86431a9264925661159fbcd16b9d3
Merged-In: I931aabaada09c87b4a7936bcde4fcff8bc237dd0
 2021-02-04 22:07:08 +00:00
Hugh Chen
cb79c659b5 RESTRICT AUTOMERGE Update String am: 085f70d48d am: 4b22b601f7 am: 26623c9572 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84520568c24220945c1ce226bafb82f7a40367af
 2021-01-07 18:31:16 +00:00
Hugh Chen
26623c9572 RESTRICT AUTOMERGE Update String am: 085f70d48d am: 4b22b601f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d34d26cddbca6559164cbaef2aab5dfc6fd035d
 2021-01-07 17:59:08 +00:00
Hugh Chen
dc2b694a54 DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev 
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Iec4d1963e626829b696c2047c5979a684119acf7
Merged-In: Iec4d1963e626829b696c2047c5979a684119acf7
 2021-01-07 06:03:10 +00:00
Hugh Chen
18c06480b0 DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev 
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Iec4d1963e626829b696c2047c5979a684119acf7
Merged-In: Idc6ef558b692115bb82ea58cf223f5919b618633
 2021-01-07 11:54:30 +08:00
Hugh Chen
4b22b601f7 RESTRICT AUTOMERGE Update String am: 085f70d48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e8afa7b93740d3653a8a6cfb476ac69023ae41b
 2021-01-06 23:32:41 +00:00
Hugh Chen
c17ec818af RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275410

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96867a323781675c52bf875c2221c348baca6b83
 2021-01-06 23:32:22 +00:00
TreeHugger Robot
d2a2867d85 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-01-03 05:10:18 +00:00
Bill Yi
88409f1af9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I838570051ce2aab9c2b98fb2bf738a06b7687893
 2021-01-02 22:27:59 +00:00
Bill Yi
783c18d8a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibc84cbad5cb80898de5f771c8e1defd43122d694
 2021-01-02 21:59:25 +00:00
TreeHugger Robot
c045ccdc5a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-01-02 18:05:17 +00:00
Treehugger Robot
30364048ce Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-02 03:14:44 +00:00
Bill Yi
502f111677 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie47dac2298ca18d01ea7d1319eab3a9dd221d191
 2021-01-01 18:34:16 -08:00
Bill Yi
dee457eea5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I32232511655da9fe89308d73e084412957f3d03d
 2021-01-01 17:46:51 -08:00
Bill Yi
3e0563138f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I31a8c787f06f10c5c985268ea2652dff6d3161ff
 2021-01-01 22:26:03 +00:00
Bill Yi
028d6f33b5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib1f949c9281dc4a209ff3ccd84f74423fd92ebb6
 2021-01-01 21:57:18 +00:00
Hugh Chen
085f70d48d RESTRICT AUTOMERGE Update String 
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
 2020-12-30 18:35:03 -08:00
Hugh Chen
8ecca02ece RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message 
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
 2020-12-30 18:34:43 -08:00
Bill Yi
0c1be5d54b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I85cdb72acedfc12b1536df9210643999e043a096
 2020-12-22 08:48:39 -08:00
Treehugger Robot
3d0be7ca05 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-20 18:43:29 +00:00
Bill Yi
cb8819b42f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If6d96e565647fb0bbbc643834aebb719fbc2d843
 2020-12-20 12:41:07 +00:00
Bill Yi
c741c74967 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia7493562157c18c8a1ad4295d310a33400d90b20
 2020-12-20 12:14:03 +00:00
Bill Yi
86fcddb29b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2a52c07fe48323256cc95a05226098db1e6ae2fa
 2020-12-19 06:15:53 +00:00
TreeHugger Robot
bd246b61d2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-17 15:12:31 +00:00
Bill Yi
b4654c5ed2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If6a00d0339bbc6474ec6cdd0c730f0b864b2b701
 2020-12-17 05:00:45 +00:00
Bill Yi
f6330f35c6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I36766724094cdd2b8525fac2177ff61545305a46
 2020-12-17 04:32:39 +00:00
Wesley.CW Wang
421cbc63ad Update Battery Defender tips title am: ee1d07d59b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13223683

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib651d0c708471af6cac52255b25159730269843e
 2020-12-15 18:48:30 +00:00
Wesley.CW Wang
ee1d07d59b Update Battery Defender tips title 
Bug: 175662315
Test: make SettingsRoboTests
Change-Id: I13ba773ea4402c5ae54260a8b8cbea4620eed535
 2020-12-15 10:21:06 +00:00
Bill Yi
a26056a6ef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ica5c216524bf124fc447dd64e2b7ca36c244fb81
 2020-12-10 12:10:19 -08:00
Xiao Ma
b48fffc33b Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev am: a63d8db293 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13170053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib822c372af03860a63533ec44638389fb25e2ffb
 2020-12-08 00:37:18 +00:00
Xiao Ma
a63d8db293 Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev 2020-12-08 00:15:53 +00:00
Wesley.CW Wang
974f359a26 Add Battery Defender feature to Settings am: 7ccb54feb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13108999

Change-Id: I3b172988dd71c520ac6e1d286ae055243cb723e0
 2020-12-07 08:29:16 +00:00
Wesley.CW Wang
7ccb54feb6 Add Battery Defender feature to Settings 
- Adding new tips of Battery Defender, will be presented once battery is overheated
 - Launch Help Center article of battery overheat when clicking Battery Defender tip
 Screenshots: https://screenshot.googleplex.com/7jUibTJANgR6UQ6.png
 	      https://screenshot.googleplex.com/tUj2LLi87SfndBN.png

Bug: 172794045
Bug: 173497281
Bug: 173496188
Test: make RunSettingsRoboTests -j40
Merged-In: Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a
Change-Id: Id400cec248a87dd27194d93bdf035e43bbcb7f4f
 2020-12-07 08:06:22 +00:00
Xiao Ma
ea12357dfa Update the Warning text about the visibility of device name. 
After enabling DHCP hostname option, the device name will be carried
in the DHCP packets when connecting to a Wi-Fi network, which is also
visible for the DHCP server (upstream AP or hotspot). Update the warning
text correspondingly.

Bug: 174644890
Test: m
Test: manual test to verify the warning text has been updated when
      changing the device name.(Settings > About Phone > Device name).
Change-Id: I031a03deb8d20fb3b3a217b0fa7d45aa1b3330d1
 2020-12-07 04:54:37 +00:00
Bill Yi
a815a12c40 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I267bdda4fe2a243d548b1842e9a08950e61069c0
 2020-12-05 16:49:34 -08:00
TreeHugger Robot
448ec6b5fe Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-05 01:04:28 +00:00
Bill Yi
d890249a20 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I106d32515484c4ad081b1a0bc2bf01d79b5097ad
 2020-12-04 03:58:02 -08:00
Bill Yi
d0f3a4ca19 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d0e585779a9e28de3aeb1eb8ca3246a09b717d4
 2020-12-04 03:09:46 -08:00
Wesley.CW Wang
15cad1e712 Update Settings Battery Defender strings am: 45a02ee994 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13146801

Change-Id: I9b6d03d465b981e13da2f056680d04f6f4f3ec6e
 2020-12-04 03:39:03 +00:00
Wesley.CW Wang
45a02ee994 Update Settings Battery Defender strings 
Bug: 172794045
Test: make SettingsRoboTests
Change-Id: Ia9612fe891431869dc8e84e78db952ac8f1ab3dc
 2020-12-03 19:00:44 +00:00
Bill Yi
4b1662623a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ied07776386dcf321cb8405f5f972bc792b696da4
 2020-12-03 14:54:31 +00:00
Xin Li
cec81e3030 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 
Bug: 172690556
Merged-In: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
Change-Id: I5d4e70fe723d890b5694c3490d6ec841b1ac596e
 2020-12-02 00:29:15 -08:00