PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,564 Commits 1 Branch 0 Tags
19ca5d6a6ec93efeedc8d80ca79e9e3d76158d3c
Commit Graph

111564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
300534f327 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3988c628f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icec8066206f26fcf53ec7a9cb68c36fd11f4dfed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:07:49 +00:00
Bill Yi
e2b79d8fcc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5c5fb43da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93b51be84ce0fa9bac390f000f251e576e3c2d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:07:28 +00:00
Bill Yi
e192853dd4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aca33157e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50d45da7db6f6c3e0691efea1dcaa0211568de45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 22:07:09 +00:00
Yasin Kilicdere
85379e9452 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I6474b049eea96fa6b51692a71ea7a2433cdfb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 13:25:59 +00:00
Yasin Kilicdere
2ecf96a422 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167

Change-Id: I2c91cb0334d6151759f925ea84286c9af619f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-03 12:53:48 +00:00
Yasin Kilicdere
15a89a60ac Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev 2023-01-03 12:18:58 +00:00
changbetty
0dcd6a5492 [RESTRICT AUTOMERGE] Change the intent flag to immutable 
Bug: 256590210
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I68132f863027fab19351b4fdbc363e5c274e3327
Merged-In: I68132f863027fab19351b4fdbc363e5c274e3327
 2023-01-03 10:25:29 +00:00
Shen Lin
bdcfaceeb2 Fix NPE in BluetoothPairingController when comparing BluetoothClass 
Bug: 264162859
Test: atest BluetoothPairingControllerTest
Change-Id: I7e3c913855d77983f4f8bc61f5b08f64fe9fae4d
 2023-01-03 06:33:51 +00:00
Grace Cheng
04c630ca8a Adding product string variants on choose lock page 
Adding product string variants on choose lock page

Test: (manual) observe fixed string on tablet on choose lock page
Fixes: 250807976
Change-Id: I4a0ab0a019708f3e0d81602967b187f6a7089dc5
 2023-01-01 21:26:52 +00:00
Android Build Coastguard Worker
c31f3ed987 Snap for 9447015 from 20d80e79da to tm-qpr2-release 
Change-Id: Id92ede572b42dc0cb019df08e262ef533ddfbb9b
 2023-01-01 02:25:54 +00:00
TreeHugger Robot
20d80e79da Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-31 06:37:56 +00:00
TreeHugger Robot
3988c628f1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-31 06:37:56 +00:00
Bill Yi
5baeaab354 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If04ffff758b1c88b3b7576858f8760893ee04bcf
 2022-12-29 20:55:43 -08:00
Bill Yi
c5c5fb43da Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaabefc3fcd1e7c28c769f416ad25a32c37beaac0
 2022-12-29 20:54:14 -08:00
Bill Yi
aca33157e1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia82d4eaed61ad8144ea278b4b64f6391cb044fb3
 2022-12-29 20:51:10 -08:00
Android Build Coastguard Worker
eee8c60bd0 Snap for 9442415 from 53b342a81a to tm-qpr2-release 
Change-Id: I973f63365a27142401d6d41b3784ca10d7bcb73a
 2022-12-29 00:25:30 +00:00
Ale Nijamkin
3802fbf7a2 Merge "Renames customization content provider (2/7)." into tm-qpr-dev am: 53b342a81a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20824496

Change-Id: I165e83754f1d6cfe7cf144c12ed5ac902dc01e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-28 18:37:37 +00:00
Ale Nijamkin
53b342a81a Merge "Renames customization content provider (2/7)." into tm-qpr-dev 2022-12-28 17:42:20 +00:00
TreeHugger Robot
420afe232b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6c9dead089 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieacff4cba7da4c415de0dd2cc1bd701b8076d4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-28 06:16:08 +00:00
Bill Yi
6632af6cda [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33f9bd645a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1327e057945f138c394950771e7664af707298b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-28 06:15:46 +00:00
TreeHugger Robot
6c9dead089 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-28 05:53:23 +00:00
Alejandro Nijamkin
2f61fd67d1 Renames customization content provider (2/7). 
KeyguardQuickAffordanceProvider has started to be used for more than
just lock screen shortcuts. This collection of CLs updates its name,
authority, and table schema to become more generically about "system UI
customization".

Fix: 262879277
Test: manually verified Settings > Display > Lock screen shows the
"shortcuts" item
Test: manually verified that the Wallpaper picker properly renders the
preview and can change the quick affordances
Test: manually verified that system UI displays the right lock screen
shortcuts

Change-Id: Idc0765a8c3fe50c82689d2ca7f9d19b41a62baf2
Merged-In: Idc0765a8c3fe50c82689d2ca7f9d19b41a62baf2
 2022-12-26 17:07:03 +00:00
Android Build Coastguard Worker
52cafe85b6 Snap for 9434600 from aee115ee3b to tm-qpr2-release 
Change-Id: Ife1ec39971b5ae5afe4bc279102c13c6605e6396
 2022-12-24 02:25:30 +00:00
Zoey Chen
d6bf9262b5 [Settings] get wrong toggle when handle the WFC changed am: aee115ee3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806352

Change-Id: Icf924f45689bfa0906661be1bfee032520cafab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-23 05:11:39 +00:00
Bill Yi
33f9bd645a Import translations. DO NOT MERGE ANYWHERE 
BUG:244160868

Auto-generated-cl: translation import
Change-Id: Ie8a089ca55dc82ff5127494172646a2f6f249610
 2022-12-22 19:31:04 +00:00
Zoey Chen
aee115ee3b [Settings] get wrong toggle when handle the WFC changed 
WFC toggle's state(EXTRA_TOGGLE_STATE) is set to the newValue after each notifyChange.
However, WFC slice gets the same newValue from EXTRA_TOGGLE_STATE when users change the toggle state
before the EXTRA_TOGGLE_STATE is updated.

Need to get the "correct" new value to set the WFC

Follow the original logic(ag/3820815), 1. don't turn on WFC and only can turn off WFC  if activationApp is not null. 2. turn on/off if  no activationApp.

Bug: 261922170
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I823f00029c24f1901f40757ba13e7c0f90d6c0bc
 2022-12-22 11:13:54 +00:00
Sandeep Jawalkar
3279e1a211 Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 749c2dddbc am: aa0205daf9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361542

Change-Id: I663ea43a6e1e06b456a5a024bc7773e10cd03a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 04:26:13 +00:00
Sandeep Jawalkar
aa0205daf9 Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 749c2dddbc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361542

Change-Id: I8fc86403f5dc64beec53d6c93d09f8c0dd3a2f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 03:52:50 +00:00
Sandeep Jawalkar
749c2dddbc Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" 2022-12-22 03:15:34 +00:00
Android Build Coastguard Worker
a3ecce010c Snap for 9428515 from e722587923 to tm-qpr2-release 
Change-Id: Ib8dab6e3cc7c5cb66ddaff3565132c7e19f76e41
 2022-12-22 00:25:35 +00:00
sandeepjs
beab3c0d43 [Android U][eSIM] Modify esim and sim card strings as part of esim primary 
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126

Test: build
Bug: 257380320
Change-Id: If2183945054255d52e89a61a04db25edd725a73d
 2022-12-21 12:01:01 +00:00
changbetty
09a6899fc2 Change the intent flag to immutable 
Bug: 256590210
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I68132f863027fab19351b4fdbc363e5c274e3327
 2022-12-21 10:16:10 +00:00
Darrell Shi
2287f6e2e9 Merge changes from topic "hub-mode-settings" into tm-qpr-dev am: e722587923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736115

Change-Id: I17bc2f1b210dd0262299cfe10c6c12f2c94cca4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-21 08:23:55 +00:00
Darrell Shi
955a2f2ac3 Change screensaver ctrlr to base pref ctrlr. am: 542644e83f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736682

Change-Id: Ic6f282087660ede4a0b1fd38378c0c5adc58bc3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-21 08:23:48 +00:00
Darrell Shi
e722587923 Merge changes from topic "hub-mode-settings" into tm-qpr-dev 
* changes:
  Add top-level Communal settings.
  Change screensaver ctrlr to base pref ctrlr.
 2022-12-21 08:03:49 +00:00
Darrell Shi
65836b1e3d Add top-level Communal settings. 
This change adds a new top-level setting, of which the availability is
controlled by a build time config value. It also registers the new
communal category so that prebuilt packages can inject preferences into
it.

Bug: 261641080
Test: verified on device that communal settings show up on top level
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: Idf79ae5b89ecc3498373de56a677b4876fb121c3
 2022-12-21 04:10:56 +00:00
Android Build Coastguard Worker
68abd980c0 Snap for 9424627 from 0ce477d1b0 to tm-qpr2-release 
Change-Id: I0e87d65ca53558cb3578d10aac7a2395c7be1fe5
 2022-12-21 00:25:49 +00:00
Daniel Norman
c01da5ab7e Merge "Update OWNERS for A11y Settings to include myself & remove others." am: 5394ffdd9d am: 38b5b5d994 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362352

Change-Id: I38b7ae19c2b6f1807f04b4b2a294569a922b16e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 19:32:38 +00:00
Daniel Norman
38b5b5d994 Merge "Update OWNERS for A11y Settings to include myself & remove others." am: 5394ffdd9d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362352

Change-Id: Ie1d066d2f331a830cfad9d23064f4f942fb28024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 18:56:02 +00:00
Daniel Norman
5394ffdd9d Merge "Update OWNERS for A11y Settings to include myself & remove others." 2022-12-20 17:57:16 +00:00
Bill Yi
f1c44c2414 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0ce477d1b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4169fea5c14a15bc2fba79dbeb4ee9872d613a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 06:14:52 +00:00
Bill Yi
99aef9fd27 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e6d50beef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7fef6931550827ef6dcd57b79afa761e17191777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 06:14:05 +00:00
Bill Yi
0ce477d1b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-20 06:00:39 +00:00
TreeHugger Robot
0abed076d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d7cc9378fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied799cc46bfe78038153363953e9768f9c7caf45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 05:45:43 +00:00
Bill Yi
94246084a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 481727404b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9dc85e04fa9f4fd6bba0479c4f5b2953c9093333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 05:45:32 +00:00
TreeHugger Robot
de200625dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fb0ce4b83f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie37f5ec1e0256c971162334e6fd0e7ea56348817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 05:45:21 +00:00
Bill Yi
37bae5ee08 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b24f771519 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id81371006dc858e249351a05c41290ffef86e4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-20 05:45:02 +00:00
TreeHugger Robot
d7cc9378fe Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-20 04:59:24 +00:00
TreeHugger Robot
fb0ce4b83f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-20 04:59:24 +00:00
Android Build Coastguard Worker
a8f97b9538 Snap for 9420665 from 669dad7687 to tm-qpr2-release 
Change-Id: Ifa3c84900c3c329c926b0386abf69fb811283a79
 2022-12-20 00:35:36 +00:00