Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,641 Commits 1 Branch 0 Tags
f1fd481d5a719dbc0887f280158d6a2d170f300a
Commit Graph

123641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
f1fd481d5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c04510b030 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6af644137a9a6f27a7aacb5009a711bbf8e1e588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 02:28:32 +00:00
Bill Yi
0ec6c3c905 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84c81f27dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51230460e12bdaeb8185e33d825129313ad9ee87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 02:28:30 +00:00
Treehugger Robot
8059b59f1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba1e5f7d00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97296ff1b9b1dc130cd60e25cb374ed8a2f7754c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 02:28:27 +00:00
Bill Yi
101387bda0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4d76486764 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4642912225744527bb48a2e834548b87082c0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 02:28:05 +00:00
Treehugger Robot
cc8d99cbc3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 363f246acd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie450e46fd541e8717cb241575134f5cb997c2bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 02:27:51 +00:00
Bill Yi
06fd9f0035 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f14bb1c1be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idef2b53000992305de841fa8514d6a7a0f8a1acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 02:27:17 +00:00
Treehugger Robot
c04510b030 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-19 01:47:24 +00:00
Treehugger Robot
ba1e5f7d00 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-19 01:47:24 +00:00
Treehugger Robot
363f246acd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-19 01:47:24 +00:00
Becca Hughes
3ac6b141a4 Merge "Rollback decision to merge by package name" 2023-04-19 00:08:57 +00:00
Becca Hughes
ca542c90cd Rollback decision to merge by package name 
At the moment settings aggregates by
package name and it has been decided that
we should do per-service instead.

Test: atest & manual
Bug: 278598419
Change-Id: I6b7c8adac4957f1c3382044208e1642d0b6e3fab
 2023-04-18 22:15:50 +00:00
Linyu He
f47ecfc82b Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779 am: e6c3d5d893 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841

Change-Id: I5bbdec5717bc387c305974a7bfccbd513fecb123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 20:19:25 +00:00
Treehugger Robot
f2160f276e Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7 am: 4ec47457ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451

Change-Id: Ic9cb5e121608b2fe7368c72275db9a31d412b713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 20:16:16 +00:00
Linyu He
e6c3d5d893 Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841

Change-Id: I0a228f9c512ee444a245e67b10a83849e53ed51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 20:04:09 +00:00
Linyu He
32acd8c90d Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779 am: 3abe7779e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841

Change-Id: I04a4b7e9a80ba6effc9f90b32be5c70303671c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 20:02:30 +00:00
Treehugger Robot
62ca723b6d Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7 am: 616fd2b0e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451

Change-Id: I3bdbc364829ba0f93454edb2c2a59c3128e2b2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 19:59:30 +00:00
Treehugger Robot
4ec47457ec Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451

Change-Id: Ib9d623e75db46f94f9b617077c9f7f96926f427f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 19:58:43 +00:00
Linyu He
3abe7779e0 Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841

Change-Id: Ieb5b5f9da097858de4dfee1928e6ec9ca741a1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 19:56:09 +00:00
Treehugger Robot
616fd2b0e0 Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451

Change-Id: Ic340037c566debd7c5b6275920b361b74e87e7f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 19:51:24 +00:00
Linyu He
e346dc6779 Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev 2023-04-18 19:36:45 +00:00
Treehugger Robot
6112e583d7 Merge "Revert "Destroy activity in onStop()"" into udc-dev 2023-04-18 19:07:33 +00:00
Liana Kazanova
94f08e4ba1 Revert "List apps which requested the TURN_SCREEN_ON appOp permi..." 
Revert submission 22338257-turnScreenOnPermission_pregrant

Reason for revert: b/278739832

Reverted changes: /q/submissionid:22338257-turnScreenOnPermission_pregrant

Change-Id: Iada276497c37c0e89a2cde8706394949d468e8e5
 2023-04-18 17:47:14 +00:00
Treehugger Robot
687acd81d2 Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824 am: 973e55818e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125

Change-Id: Ib7132d81a06345b2d2a36ab4b1f906a8c395c818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 17:19:08 +00:00
Treehugger Robot
2f6ea6addb Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824 am: b24b622c3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125

Change-Id: Ia14eb54b4b0826dee20b761be9a22078849bdeed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 17:18:35 +00:00
Treehugger Robot
b24b622c3c Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125

Change-Id: I655b1178eaea787df684067ee4e09283f3969625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 16:56:25 +00:00
Treehugger Robot
973e55818e Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125

Change-Id: I2a579eab5db50e7209814a126c90f0fb5bcbd2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 16:55:22 +00:00
Treehugger Robot
dc02736824 Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev 2023-04-18 16:21:11 +00:00
Philip Junker
04ac0e4a52 Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c am: 821e2b5d8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104

Change-Id: I4f37fd7c7c5b6bd77035aea2a9f03c3478bf0067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 16:18:21 +00:00
Philip Junker
61a9f88c33 Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c am: 632da3759f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104

Change-Id: Id7262f3031d2e0e833ef154510d033dcb62eb699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 16:15:02 +00:00
Philip Junker
821e2b5d8b Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104

Change-Id: I35d6b22c7ca33e80abb265a9f0bb1fbaf1eb2279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 15:53:33 +00:00
Philip Junker
632da3759f Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104

Change-Id: Ib6a1346bbf7768360a758fe720452117fbc72d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 15:52:47 +00:00
Philip Junker
c57e5c0e2c Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev 2023-04-18 15:36:55 +00:00
Weng Su
d965ff3049 Fallback to "Extended Compatibility" if Speed feature is not ready 
- Fallback to the "Extended Compatibility" design when the following conditions occur
  - 5 GHz band is not supported on the device
  - 5 GHz SAP available channels cannot be obtained from WifiManager
  - 6 GHz SAP available channels cannot be obtained from WifiManager

Bug: 272450463
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
         WifiHotspotRepositoryTest \
         WifiTetherSecurityPreferenceControllerTest.java \
         WifiTetherMaximizeCompatibilityPreferenceControllerTest

Change-Id: If7c8c41ebe86f5e7d8e4737ab7a82d38c9d633de
 2023-04-18 20:49:25 +08:00
TreeHugger Robot
92e0bf9b1f Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073 am: 6abeadaf77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947

Change-Id: Iaf6887c5037b07f2dcc6725ca411db2a3f65b69c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 12:04:02 +00:00
TreeHugger Robot
c5900dcf26 Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073 am: 4f2f22f89c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947

Change-Id: Ida98b40f1b197b5dabe373213fc43ff1f318df32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 12:02:07 +00:00
TreeHugger Robot
6abeadaf77 Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947

Change-Id: Iabc92854c80d421f2941ab04ad86ee46d6e4cedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 11:38:58 +00:00
TreeHugger Robot
4f2f22f89c Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947

Change-Id: I1104418200a50b0923793060615c250b8e22e7e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 11:38:24 +00:00
TreeHugger Robot
c974342073 Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev 2023-04-18 11:17:16 +00:00
Zoey Chen
a3c3ae6944 Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6 am: 4f01523156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648

Change-Id: Ie41a3d6d0ae77e6c6192ddd8745e30914f0f11bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 10:54:57 +00:00
Zoey Chen
cfff3dc1c2 Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6 am: affb6ad3c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648

Change-Id: Id1ec4f1e555b5a29c33fba3ce82d44c1f598c2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 10:54:44 +00:00
Zoey Chen
4f01523156 Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648

Change-Id: I887e0086b36b621cfdd8ad3d5000e24914757fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 10:32:39 +00:00
Zoey Chen
affb6ad3c9 Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648

Change-Id: I25017a2a897fa689c5f103437ae4bae0594c5259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 10:32:37 +00:00
Zoey Chen
cd719845d6 Merge "[Settings] Fix the layout index" into udc-dev 2023-04-18 10:02:40 +00:00
Zoey Chen
5e987f49dd [Settings] Update the footer link in Regional Preferences 
Bug: 277573274
Test: local test
Change-Id: I0c02cee71365f98d89d98e4147e1eb5245b7ede9
 2023-04-18 09:59:24 +00:00
Bill Yi
84c81f27dc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I44e550e9606eb4b356466de5cfe7f3115c245d61
 2023-04-18 02:42:44 -07:00
Bill Yi
4d76486764 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I95c8be5f421f2f6468503877f874a69e86debe8e
 2023-04-18 02:28:17 -07:00
Automerger Merge Worker
d0fdc9b978 Merge "Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a am: 2fb71a4548" 2023-04-18 09:26:18 +00:00
Jason Hsu
dd9803ccf7 Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a am: d3453f681c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523

Change-Id: If2daf9293d431799df85b1a1fd299fd16cd1a790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 09:25:41 +00:00
Jason Hsu
d73c3689c2 Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a am: 2fb71a4548 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523

Change-Id: I52afe43b8a614344d8027d7f289e4acda538e48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 09:25:31 +00:00
Bill Yi
f14bb1c1be Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0effead0d0a2cad9e240f63b0e27a2c66751b6be
 2023-04-18 02:23:03 -07:00