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

79638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4c696451f9 [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: I57f7dcae96383ee527572eaa92b92ed4d01be3d3
 2021-02-13 19:23:36 +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
a9a34673b2 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: I049b584d87bfda0f5bc479448d0481881b337b3f
 2021-02-12 17:28:31 +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
bdb967c756 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: If7b189201fb37be2ae652b5155e94068cfc07289
 2021-02-12 17:16:30 +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
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
e50ffd6366 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: I99f7c44b694bde8b682a6dade3f5406b650b702d
 2021-02-12 04:48:15 +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
bca31c4c62 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: I66ed4953ebcdbd66b8cfa5d6073aadc2d499eb0f
 2021-02-11 17:58:30 +00:00
TreeHugger Robot
76971db7bb Merge "[FakeUid] BatteryStats.getCustomMeasuredEnergiesMicroJoules()" into sc-dev 2021-02-11 17:42:30 +00:00
TreeHugger Robot
c0394c2ba7 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: I8e2ede820e427f2d18282cc2b3f6a79ff62b8002
 2021-02-11 14:46:30 +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
a836735535 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev am: 374ae167e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13515168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2552756df631eb10a7418c36623c9957dc5bfa8d
 2021-02-11 08:50:32 +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
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
62625e5873 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: I5dbad269a626baca956deb07dee37e3882c455a3
 2021-02-09 23:41:27 +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
Abel Tesfaye
8630f0387f Merge "Implemented new preference setting screen for face based auto-rotation" into sc-dev am: 7fb3323b1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13419010

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7d693f5ebcab4f3cd6ba3336418b07cb2a1e9d7
 2021-02-09 22:10:51 +00:00
Abel Tesfaye
7fb3323b1c Merge "Implemented new preference setting screen for face based auto-rotation" into sc-dev 2021-02-09 21:06:08 +00:00
Chloris Kuo
aa72ee8613 Merge "Remove NAS adjustments related settings" into sc-dev am: 16dfec5d9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13500414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a053d229c0c42549753975cfe744bee5216a9b0
 2021-02-09 17:17:50 +00:00
Chloris Kuo
16dfec5d9c Merge "Remove NAS adjustments related settings" into sc-dev 2021-02-09 17:12:24 +00:00
TreeHugger Robot
60201bcbe4 Merge "Fix the issue of the repo upload hooking checker" into sc-dev am: f771e6267a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13532865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia796793e77a8f46035cbda1a00009b800217504e
 2021-02-09 16:49:22 +00:00
TreeHugger Robot
f771e6267a Merge "Fix the issue of the repo upload hooking checker" into sc-dev 2021-02-09 15:56:03 +00:00
Treehugger Robot
48e39791cd Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870 am: 29302ad638 am: ef81307178 am: e04edeca48 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icabf8cc492236d641aaf353fda0798b37a719433
 2021-02-09 14:09:15 +00:00
Sunny Shao
79d0a1fead Fix the issue of the repo upload hooking checker 
Fixes: 179608805
Test: repo upload test
Change-Id: I212d4e767a63d5b69ac62fd8e8f0a17f2863b5ef
 2021-02-09 21:41:48 +08:00
Treehugger Robot
e04edeca48 Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870 am: 29302ad638 am: ef81307178 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e15b275b641c614e5f55d27204fd72f90f723b8
 2021-02-09 13:12:03 +00:00
Treehugger Robot
ef81307178 Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870 am: 29302ad638 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71456415072c95cbb7a91f0538d0c07d323ec612
 2021-02-09 12:45:11 +00:00
Treehugger Robot
29302ad638 Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d050875038408172e538290a53d10306d986578
 2021-02-09 12:21:58 +00:00
Jing Ji
492e985708 Fix crash issue when NetworkSelectSettings UI goes OFF and then ON 
When updating selected preference instance by index, since
mPreferenceCategory hasn't been updated yet, and then there is a
possibility that the index is over the size of preference, so this
would result to Settings crash because IndexOutOfBoundsException
was detected in NetworkSelectSettings.
After updating the network preferences of mPreferenceCategory, update
the selected preference.

Test: manual - Checked that crash does not occur when
NetworkSelectSettings UI goes OFF and then ON.
Test: auto - Passed NetworkSelectSettingsTest.
Bug: 179754915

Change-Id: Ib736fe8fdcc82c3ac01ad1828d0f2a1c24610f2b
 2021-02-09 09:42:03 +00:00
Treehugger Robot
ace5a90870 Merge "Switch Settings from IConnectivityManager to VpnManager." 2021-02-09 09:09:35 +00:00
TreeHugger Robot
fb54a41a20 Merge "[Provider Model] Update Wi-Fi SSID in APM networks type" into sc-dev am: f2d710cfd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513426

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77ba665ac5ddedbb2dfb98ea6605fc85ce0fe668
 2021-02-09 04:07:26 +00:00
Lorenzo Colitti
62cb87b5d9 Merge "Switch Settings from IConnectivityManager to VpnManager." into sc-dev am: c00fa910ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13519006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8de7fcbe38c34f8b7eb07b854748b4984b9e453
 2021-02-09 04:07:22 +00:00
TreeHugger Robot
f2d710cfd1 Merge "[Provider Model] Update Wi-Fi SSID in APM networks type" into sc-dev 2021-02-09 03:37:58 +00:00