PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,481 Commits 1 Branch 0 Tags
5b68b8eeddda7bdd0ff322e5d49809d00321b84f
Commit Graph

102481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
5b68b8eedd Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e am: e8619c8d08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597

Change-Id: I4d314984a49ab3341b8a3eb9035117a4a3f7d846
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 11:42:18 +00:00
Bonian Chen
e8619c8d08 Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597

Change-Id: I7afa87de1ae7ec6d271dec993794a8c7295195f6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 11:35:52 +00:00
Bonian Chen
a3df120063 Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a am: 1d1c2826c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326

Change-Id: I314cae5a38f87733a4d52e3d92c41d0b09c37ed6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 11:35:18 +00:00
Bonian Chen
d8bd42d6f3 Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e am: 6483721f20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597

Change-Id: I1ee76a888432e9d153ecd50cfbf6e7197ef5a8df
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 11:35:12 +00:00
Jason Hsu
691b1ef4f0 Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: c0fb12cf7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930

Change-Id: I1aa31319a784f34ea2f405a8e124b060d9423ad9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 11:35:05 +00:00
Jason Hsu
cd187d8bed Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c am: 2fc065c351 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930

Change-Id: I787b0707020d38f73f53a0a283272dd074268ed8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 11:34:55 +00:00
Bonian Chen
1d1c2826c9 Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326

Change-Id: I334058bf9a010783514ab685885c9c6c8d86cc8b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 11:34:33 +00:00
Bonian Chen
6483721f20 Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev am: 3fc05a917e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903597

Change-Id: I1d5d21181e8675669ce2eec07995105c82dd947b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 11:34:16 +00:00
Bonian Chen
73c8e2f45a Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev 2022-04-26 10:25:31 +00:00
Bonian Chen
3fc05a917e Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev 2022-04-26 10:25:02 +00:00
Jason Hsu
2fc065c351 Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930

Change-Id: If7c97872d17ba3a0e4454d1b9f30b520cbbd81db
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 09:02:58 +00:00
Jason Hsu
c0fb12cf7c Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930

Change-Id: I5370613843e746c5c0c71f5da9155612d97f34dd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 09:01:42 +00:00
SongFerng Wang
60f2227360 Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c am: 45d498e411 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395

Change-Id: I748fe2f30b3e69bebf67e134d090c88319fb2e29
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:30:52 +00:00
SongFerng Wang
892bafec43 Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c am: 9c6211e043 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395

Change-Id: Ifb3e8d06c36a22089261315a7b08dfba152ceb09
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:16:57 +00:00
Jason Hsu
12c10cfa5c Merge "Correct Magnification shortcut title" into tm-dev 2022-04-26 08:07:37 +00:00
SongFerng Wang
45d498e411 Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395

Change-Id: Ib83808167690f7b67cef48ef53764a1f7e500897
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:02:48 +00:00
SongFerng Wang
9c6211e043 Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395

Change-Id: Id978d5b9524984ab553bc301fa6b6173afcb56ec
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:01:34 +00:00
SongFerng Wang
1bc142776c Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev 2022-04-26 07:36:28 +00:00
Chaohui Wang
295d56267e Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 6dc65f1eb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I35b7b67d86557eb9a03d07a62adda253ae22ccc4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:27:36 +00:00
Chaohui Wang
5094979554 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 61a35e7b85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I868e35ed12d7143c6d8fdea63e52feb628163c90
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:27:31 +00:00
Chaohui Wang
61a35e7b85 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I71d0c09c5c1419f48bd3dd754eeaafa1acbf17f7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:52:31 +00:00
Chaohui Wang
6dc65f1eb4 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: Iea7bef3ceebeb17a54314389a1314a378d383d5c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:16 +00:00
Chaohui Wang
1a39660de0 Merge "Update Personal / work selection UI." into tm-dev 2022-04-26 06:34:37 +00:00
Automerger Merge Worker
3f5b45397a Merge "Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58" into tm-d1-dev-plus-aosp 2022-04-26 06:28:08 +00:00
Jason Chiu
370c61e339 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I3b5e38835df123445bf89e270a36b7dd4a759b1b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:28:06 +00:00
Jason Chiu
ca7d463f4d Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I524ebc3da76ccac4bbbdaa6c0601c11d8f324379
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:28:05 +00:00
Automerger Merge Worker
d53e79d292 Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b" into tm-d1-dev-plus-aosp 2022-04-26 06:28:02 +00:00
TreeHugger Robot
7ba258ee83 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Ie95b750091bf22ac690c73ebb49d63c906e047c2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:59 +00:00
TreeHugger Robot
81f281b6dc Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I955609258cbd7ab4faeaa0748a13e55fff2e5a03
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:59 +00:00
Jason Chiu
b174c6853e Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: Ia100a0ee19b88d603887cad11b1849d1a5b9d2cd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:12:57 +00:00
TreeHugger Robot
5f3059ff3e Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Ice45d444bedfecaad34cce27fedd38528cd5ab91
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:12:49 +00:00
Jason Chiu
5fe986be58 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I227ce218c0b7096412012ec04c356fa60e908882
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:40 +00:00
TreeHugger Robot
734ada269b Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I5e3948fb746aa2eb485cc0a2113f9f06a4ed234f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:31 +00:00
Jason Chiu
81ee2037ed Merge "Renew the highlight state color" into tm-dev 2022-04-26 06:08:40 +00:00
TreeHugger Robot
5a083d2bfe Merge "Change the alignment of the foreground preferernce controller" into tm-dev 2022-04-26 05:44:37 +00:00
Joshua Mccloskey
eb4fa99d5a Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: I6d5b095918d499447fa67f2e0ac2b28345885e32
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 21:37:30 +00:00
Joshua Mccloskey
e7c507070d Merge "Modified Fp -> Face setup flow" into tm-d1-dev 2022-04-25 21:14:39 +00:00
TreeHugger Robot
3f5a3ce250 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Ic0825c41a3879402d05a27bdffa48678143361aa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:59:07 +00:00
TreeHugger Robot
7e8278e3cc Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Id1d714a163113bebcc44243be6f75330b6312039
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:58:57 +00:00
TreeHugger Robot
09c7795dfa Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I7b6f267436a95259a68e1cfcc7be3545e83e49e1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:36:52 +00:00
TreeHugger Robot
6abf8e2f78 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I1931a6139fd93fe5781a1743b695a36ddc0c8579
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:35:50 +00:00
TreeHugger Robot
5d218d9fa4 Merge "Allow intent into Privacy Controls page" into tm-dev 2022-04-25 18:09:39 +00:00
Jan Tomljanovic
cfd80d65f0 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I45d7b7dcd48b82d68d80ad72bfa1619ffec831b3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:57:24 +00:00
Jan Tomljanovic
d6c1353a80 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: a474c51a04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I66d3322cdc54151f685d31fa71caa0bfeacd0ff3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:57:20 +00:00
Jan Tomljanovic
2a9fb8aa47 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I6b8ae6593ba12751b4eb2be7cea75256e18638a9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:23:57 +00:00
Jan Tomljanovic
a474c51a04 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I070dae172e3998101c04bc58edccf3aed262840b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:23:05 +00:00
Jan Tomljanovic
e22fa138aa Merge "Don't show back arrow in Security when in split mode." into tm-dev 2022-04-25 13:52:31 +00:00
SongFerngWang
e5fff060a2 [MEP] show the DSDS mode selection dialog for user when user insert esim 
If device has esim, then user inserts esim in SS mode. Then, UI should show
the DSDS mode selection dialog for user.

Bug: 230050990
Test: build pass and manual test.
Change-Id: Ia4e695ae2c4e86d6039e03738378989a0879cc71
 2022-04-25 21:07:26 +08:00
Chaohui Wang
f250493787 Update Personal / work selection UI. 
Implement the new-look by using AlertDialog's
custom title and custom view.
Using the RecyclerView so we can display profile
horizontally.

Bug: 174626616
Test: manual & robolectric
Change-Id: I9f5a7685d9217fc62e01799ad73f9b9a3ddbf19a
 2022-04-25 19:12:38 +08:00
Betty Chang
0027d94245 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: 21b9bb97d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ibc05a54d837f9f0dceea1a98da008d2783fb2214
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 10:59:57 +00:00