PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,622 Commits 1 Branch 0 Tags
a80c9c396a907ab45222a9de6dc789bcfa0cadc3
Commit Graph

79622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
3deffe9f04 Merge "Fix SettingsActivity name" into sc-dev 2021-02-16 15:07:56 +00:00
TreeHugger Robot
724d0e4635 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 73fe82071d -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44bcda73e76ef0e1907fc3009a2baeb3390ede51
 2021-02-16 09:01:37 +00:00
TreeHugger Robot
73fe82071d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-16 08:36:24 +00:00
Alex Johnston
cbdfd8b3d7 Merge "Disallow modifying USB in Settings" 2021-02-15 20:28:37 +00:00
TreeHugger Robot
6bf448cb32 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-15 09:02:21 +00:00
Bill Yi
a38dbb908f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idb0bb381925e39f50a95c86e5cf1cbd0e06796eb
 2021-02-15 08:13:48 +00:00
Bill Yi
6abad5abce Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idafe3f46c45a1e216f09283cf84cb8ef14d46442
 2021-02-15 07:44:13 +00:00
Ben Chung
6f67b151ab Update accessibility settings layout am: 478db86589 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13517006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf263a886ff5513dd010dcb744e50013d1c42596
 2021-02-14 18:52:45 +00:00
Ben Chung
478db86589 Update accessibility settings layout 
Accessibility settings category restructure
1. Add caption category fragment for related accessibility services.
2. Remove experimental category.

Bug: 174829936
Test: atest AccessibilitySettingsTest
Change-Id: I13b1ed62afe0634329d1e340ba154454640fadd6
 2021-02-14 15:11:59 +00:00
TreeHugger Robot
004653a2a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 380d004b6c -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5f1cd753907b9679e189bf6b99c3bfb6b42c481
 2021-02-13 21:23:27 +00:00
TreeHugger Robot
a5a878dfc2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-13 21:07:53 +00:00
TreeHugger Robot
380d004b6c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-13 21:00:44 +00:00
TreeHugger Robot
fdb8f38dac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c27fab1d5e -s ours am: af061ae9e1 -s ours am: 3a09a2cda2 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd7da250033022392e2e5ba0c11c5711b07252e0
 2021-02-13 19:33:36 +00:00
Bill Yi
e50c3b05e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf789f35a -s ours am: d3ee559603 -s ours am: 9172c947b6 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3eff75d4630337dbc096d72347a42f66554929b3
 2021-02-13 19:33:30 +00:00
TreeHugger Robot
3a09a2cda2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c27fab1d5e -s ours am: af061ae9e1 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bf0c191de51029dbfef6a484475701dd04f982a
 2021-02-13 19:26:06 +00:00
Bill Yi
9172c947b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf789f35a -s ours am: d3ee559603 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93350bdec9f8e3f42dbb33b6f856d91c78739c11
 2021-02-13 19:25:58 +00:00
Bill Yi
a8d3a66a22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1c109b18f -s ours am: bdcdfac39c -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f2cdd5b2b28e20102d74229b9bfe23278ece94c
 2021-02-13 19:23:00 +00:00
TreeHugger Robot
af061ae9e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c27fab1d5e -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I061359a6ab7e65349f93ef6b0ebc5dd145623217
 2021-02-13 18:32:45 +00:00
Bill Yi
d3ee559603 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf789f35a -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4676a7e5b838ff558ecd79f3ea1e3f2159c7048d
 2021-02-13 18:32:38 +00:00
Bill Yi
bdcdfac39c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1c109b18f -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3d1fc9eb229a7279789e1d832a85107755499a4
 2021-02-13 18:32:17 +00:00
TreeHugger Robot
c27fab1d5e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 17:54:17 +00:00
Bob Badour
6695ff84d9 [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings 
Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp
  protos/Android.bp
  tests/anomaly-tester/Android.bp
  tests/perftests/Android.bp
  tests/robotests/Android.bp
  tests/uitests/Android.bp
  tests/unit/Android.bp
  tests/unit/InstrumentedEntitlementApp/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I81f11a66b5977cb5096e262819084706af5fa54c
 2021-02-12 17:08:01 -08:00
Peter Kalauskas
418dcf42dd Merge "Revert "Update icons and text for guest user"" into sc-dev am: d7af6821dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13554661

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4887ad4d5d5b85919c30df3977daddfe5d737ad0
 2021-02-12 17:38:02 +00:00
Peter Kalauskas
d7af6821dc Merge "Revert "Update icons and text for guest user"" into sc-dev 2021-02-12 17:26:47 +00:00
Chloris Kuo
d977b8edce Merge "Remove Feedback UI Settings" into sc-dev am: da031064c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13556692

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d815a2038c2a9191ee48ee003a46e32345190db
 2021-02-12 17:16:15 +00:00
Chloris Kuo
da031064c6 Merge "Remove Feedback UI Settings" into sc-dev 2021-02-12 17:11:30 +00:00
Bill Yi
acf789f35a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9f6118a293ecb1c5d671398e9253e8908cf18c94
 2021-02-12 04:56:56 -08:00
Bill Yi
de0c91786a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1e836778f9c8ad88a60c316cf6bd246c48c007d8
 2021-02-12 11:45:30 +00:00
Bill Yi
1d0fe4083a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I26b525e8f9816334508d02776c2d8d56c22a2b4d
 2021-02-12 11:15:59 +00:00
Bill Yi
f532cdefb0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9adb00d0640a1550bf967bc70baae11bcc7ee605
 2021-02-12 09:25:35 +00:00
Bill Yi
e1c109b18f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I92331438bfe6ec4d779d6238a9892f6d1cb72de1
 2021-02-12 08:02:38 +00:00
Julia Reynolds
16a0e26151 Merge "Add package filtering to NLSes" into sc-dev am: 776919fc0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13499641

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I447c9b944a2435abac4acd53b66a260c1e8d8003
 2021-02-12 04:48:29 +00:00
Julia Reynolds
776919fc0a Merge "Add package filtering to NLSes" into sc-dev 2021-02-12 02:16:52 +00:00
Chloris Kuo
c22654c075 Remove Feedback UI Settings 
remove settings from developers option and use deviceconfig to control

Test: manual on device
Bug: 180057146
Change-Id: Ic72d0f49e6f47aaeb541b997779d2cd66ca2b287
 2021-02-11 17:21:01 -08:00
Peter Kalauskas
06b235e497 Revert "Update icons and text for guest user" 
Revert submission 13278947-new-guest-user-strings

Reason for revert: Use same strings and text as Android R
Reverted Changes:
I8e9b7992d:Update icons and text for guest user
I42c0b46fd:Update icons and text for guest user

Bug: 169783558
Change-Id: Id038ec708e9098c856c4d24ae55a3b7e2bad391d
 2021-02-11 22:29:38 +00:00
Julia Reynolds
20814ed5c7 Add package filtering to NLSes 
Now users can prevent a given notification listener from seeing
notifications from particular apps.

Test: settings unit tests
Bug: 173052211
Change-Id: Ia868d6dc2da1ae7f75c0dca47034e28910584acd
 2021-02-11 19:00:57 +00:00
TreeHugger Robot
772886ac99 Merge "[FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()" into sc-dev am: 76971db7bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13547202

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I200e375b7163049ba4b8a7730266cf46dae80046
 2021-02-11 17:59:16 +00:00
TreeHugger Robot
76971db7bb Merge "[FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()" into sc-dev 2021-02-11 17:42:30 +00:00
TreeHugger Robot
cf4f8fb413 Merge "Use InternalActivity when ForceVerifyPath is set" into sc-dev am: 6ef5f04d95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13552669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2843e4039a00835550244186d0c64d1aa956b68e
 2021-02-11 14:43:54 +00:00
TreeHugger Robot
6ef5f04d95 Merge "Use InternalActivity when ForceVerifyPath is set" into sc-dev 2021-02-11 14:23:26 +00:00
Rubin Xu
11ba18ad94 Use InternalActivity when ForceVerifyPath is set 
ConfirmLockPassword enforces that ForceVerifyPath
can only be set when caller is launching InternalActivity,
so the builder needs to launch that activity instead.
This is regressed from Idf6fcb43f7497323d089eb9c37125294e7a7f5dc

Bug: 179172552
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I8e03fc69c4748d09f17c29edaa77594e233f79ea
 2021-02-11 12:40:09 +00:00
SongFerng Wang
90be406985 [automerger skipped] Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev am: 374ae167e1 -s ours 
am skip reason: Change-Id Ib95f6a012c0f725335f46e17b8414005a76ad5c9 with SHA-1 961c3184cf is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifde28a03440f70995f871018267b144ea31fdf76
 2021-02-11 08:49:17 +00:00
SongFerng Wang
374ae167e1 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev 2021-02-11 08:28:21 +00:00
Rahul Sabnis
faa3647257 Skips the bluetooth consent pairing dialog if the device has recently been 
associated with the companion app that requested the bond through CDM

Bug: 172006481
Test: Manual
Change-Id: I9a8ae1c3c7aed46295e7b0958b5c1b59960e3a26
 2021-02-10 21:25:36 +00:00
Adam Bookatz
738376dbaa [FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules() 
Fake Uid.getCustomMeasuredEnergiesMicroJoules() for new BatteryStats API.

Bug: 179107328
Bug: 174818228

Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Test: atest FrameworksCoreTests:com.android.internal.power.MeasuredEnergyStatsTest
Change-Id: Id55d52cad6622289aa0f39cfdb24799cac393878
 2021-02-10 13:18:43 -08:00
Fabian Kozynski
662de5311d Fix SettingsActivity name 
The name now matches that in the manifest

Test: manual, launch through intent
Bug: 179920615
Change-Id: I9c2ab90c66e97dffaac15dc522758d3e6dd9f2d5
 2021-02-10 14:47:50 -05:00
SongFerng Wang
1beee88d57 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" 2021-02-10 08:33:20 +00:00
Jiashen Wang
f49a21d78d Change SIM dialog activity theme 
Bug: 153811431
Bug: 170508680
Test: Test manually
Change-Id: Ifc5697a3cc80b3e74144a67c5847820ee15bd2fa
 2021-02-09 16:45:26 -08:00
Peter Kalauskas
a689c1bbff Merge "Revert "Revert "Revert "Show "Add users from lock screen" dependent on secure lock screen."""" into sc-dev am: 2b9f139a2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13502922

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8bdd8673766b0dcf2d7bd0750d3d7845ffafc76
 2021-02-09 23:42:47 +00:00
Peter Kalauskas
2b9f139a2d Merge "Revert "Revert "Revert "Show "Add users from lock screen" dependent on secure lock screen."""" into sc-dev 2021-02-09 23:03:09 +00:00