PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,640 Commits 1 Branch 0 Tags
81c97af835a9a9d9dde0a9719d52713d8e3336d3
Commit Graph

93640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
81c97af835 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb 2p: 8d94de2962 
Blank merge reason: parent was merged -s ours

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

Change-Id: I4dac108fb9b72bb7180e3870ac0133ee0f4138c3
 2021-08-17 05:49:52 +00:00
Bill Yi
8d94de2962 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb 
Blank merge reason: commit message contains skip directive

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

Change-Id: I82e01f7a48919bec7e5d1d97788d7b72e239d831
 2021-08-17 05:49:49 +00:00
Bill Yi
d1e4f888fb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icabf059c62f547d2bf1bef0bc04e8e22d1613bc9
 2021-08-16 22:49:25 -07:00
Treehugger Robot
4056b335ce Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c am: 78ed3bb6ee am: 5f69669adb am: bba477b3ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: Id2ad6188daec7edc8eadd67aaa8d7e9a52ff8208
 2021-08-17 05:01:37 +00:00
Treehugger Robot
bba477b3ed Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c am: 78ed3bb6ee am: 5f69669adb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: Ifc7949ccb9eb3e9b15eaa3fea78d2a90c0024a6e
 2021-08-17 04:53:01 +00:00
Treehugger Robot
5f69669adb Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c am: 78ed3bb6ee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: Ibf4c5605ece3d2f49602b60602c523d1e7c4877b
 2021-08-17 04:41:07 +00:00
Treehugger Robot
78ed3bb6ee Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: I3d44a009fc1fb653a074c0b5075b673dcbee82d8
 2021-08-17 04:28:48 +00:00
Treehugger Robot
b294717b4c Merge "Update OWNERS." am: 0544dc7b92 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: I8cef16ea650efa1d2f2479055779a84d266b7085
 2021-08-17 04:09:55 +00:00
Treehugger Robot
0544dc7b92 Merge "Update OWNERS." 2021-08-17 03:57:07 +00:00
Jason Hsu
7e4f26a729 Merge "Update the button navigation preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: e4824d8ee0 am: 3f5218a971 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552652

Change-Id: I0fbb00a00f65480bf59e35e7d4de89cf3244b5ca
 2021-08-17 03:25:07 +00:00
PETER LIANG
dce6b4fe01 Merge changes I57306532,I1fba7ee1 into sc-v2-dev am: 4cddfd2b00 am: 976b30afe3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15478953

Change-Id: I80bb3f0e0d9617dadb3814f2bce8b19d4bb899a9
 2021-08-17 03:25:00 +00:00
TreeHugger Robot
4b7d30a008 Merge "[Settings] Avoid from immediate update when UI inactive and SIM absent" 2021-08-17 03:17:03 +00:00
Jason Hsu
3f5218a971 Merge "Update the button navigation preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: e4824d8ee0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552652

Change-Id: I2d0eaadd04c8a323c9a85ecfeb27c6f18151fb87
 2021-08-17 03:16:40 +00:00
Jason Hsu
e4824d8ee0 Merge "Update the button navigation preview image in 'Accessibility button & gesture' page." into sc-v2-dev 2021-08-17 03:14:48 +00:00
PETER LIANG
976b30afe3 Merge changes I57306532,I1fba7ee1 into sc-v2-dev am: 4cddfd2b00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15478953

Change-Id: I6eee350feacecdb9d4bc83f6e297ac4c374c89e5
 2021-08-17 03:12:08 +00:00
YUKAI HUNG
dc29c4b018 Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev am: 7053c5e265 am: 1b92bfe010 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552649

Change-Id: Icfb09198ad2ba0fe1a0fd29f76e39a143d302a79
 2021-08-17 03:07:46 +00:00
PETER LIANG
4cddfd2b00 Merge changes I57306532,I1fba7ee1 into sc-v2-dev 
* changes:
  Update the instruction images in Accessibility tutorial dialog.
  Update the instruction images in Accessibility edit shortcut dialog.
 2021-08-17 03:00:28 +00:00
YUKAI HUNG
1b92bfe010 Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev am: 7053c5e265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552649

Change-Id: I97ee066342d3c66bfa279eab6e238942f64eee3f
 2021-08-17 02:54:11 +00:00
YUKAI HUNG
7053c5e265 Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev 2021-08-17 02:37:37 +00:00
Bonian Chen
74af46cc82 Merge "[Settings] Avoid from main UI thread blocking on accessing eSIM" 2021-08-17 01:51:55 +00:00
Curtis Belmonte
a17539fbdc Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b am: 4f1672ce7b am: 1ca0b522d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ic5f192d8cb5aade4d0eb2da3a45eb1db8f23ac35
 2021-08-17 01:46:22 +00:00
Curtis Belmonte
1ca0b522d1 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b am: 4f1672ce7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I59cfe8ed9fcbcaf34c885edbe8dfe480df503dbf
 2021-08-17 01:31:46 +00:00
Curtis Belmonte
bdb9435bb6 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b am: 115bbd0556 am: 26b90c2cee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I223f70cf6621089768cf414414170058d656e993
 2021-08-17 01:28:50 +00:00
Curtis Belmonte
fa10f95ec6 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: f07f8b57eb am: 09beed19de am: a5d6a791af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Id7d0615369e24f42681feebdef3bec53b302c2d3
 2021-08-17 01:28:11 +00:00
Curtis Belmonte
5e5a8cd4a6 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69 am: 474fba01f1 am: bf54fec03a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I55ae6875b4a3f7698eba3f21f8e69dbd9328d46e
 2021-08-17 01:27:35 +00:00
Curtis Belmonte
26b90c2cee Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b am: 115bbd0556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I3246c51ffeab997b5dbdb5a82f1ce8457ef57428
 2021-08-17 01:19:04 +00:00
Curtis Belmonte
115bbd0556 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I990c32d04641473d686914558eb801a1d0e865d7
 2021-08-17 01:15:51 +00:00
Curtis Belmonte
4f1672ce7b Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I8f77b33b4bcba08b8a25965cf165db290aaeca11
 2021-08-17 01:15:50 +00:00
Curtis Belmonte
a5d6a791af Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: f07f8b57eb am: 09beed19de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Idbced9b8570515f2a57d9458586ac9cb1bbebb66
 2021-08-17 01:15:23 +00:00
Curtis Belmonte
bf54fec03a Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69 am: 474fba01f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Icc46cedb2fcd2e7a7bc471a029f2e7c832cecbdc
 2021-08-17 01:15:04 +00:00
Yomna Nasser
9057e39d7f Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: ea343fa5a4 am: cc7d1df747 am: f64dc309ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: Ia48a04ba72dddc241d1378e1638ed0e7db9d773b
 2021-08-17 01:10:40 +00:00
Yomna Nasser
b4034002b4 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: ea343fa5a4 am: 4ff69294a4 am: e4bfb7de87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I37ac2d1bd35a8eef30b408944013b304b52ec2da
 2021-08-17 01:10:33 +00:00
Yomna Nasser
22bbcb5acd Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: 87259ab2af am: da6c658b99 am: 19c1eba133 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: Id58f711e1671d0347ebc78cc13fa1a268e6b9b53
 2021-08-17 01:10:21 +00:00
Curtis Belmonte
09beed19de Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: f07f8b57eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I4b1c644efefef622f6fdc5b426f38ead71adc1ec
 2021-08-17 01:02:27 +00:00
Curtis Belmonte
36a42b630b Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ia1824f9bbb81d95e928f32f39f088a4a6aeaef9e
 2021-08-17 01:02:08 +00:00
Curtis Belmonte
474fba01f1 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ibb2a4c9f98a1c6f302288252201d12f28de4a1e1
 2021-08-17 01:01:47 +00:00
Curtis Belmonte
af9f57c928 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: fe7d4e0100 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I094031933a8eff88ffb0357649d86ee94e1c121c
 2021-08-17 01:01:28 +00:00
Curtis Belmonte
fe7d4e0100 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I3be1462474321f1834f44cd193836ec71dd20542
 2021-08-17 01:01:21 +00:00
Curtis Belmonte
a0847b6130 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-mainline-prod am: 562d29d081 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ia95f2c062c6dcdbd40ed5f51bcb7c4fa96dc3f88
 2021-08-17 01:01:21 +00:00
Curtis Belmonte
f07f8b57eb Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I6428763357c016f863a7eead05c8424b7efe9ba4
 2021-08-17 01:01:17 +00:00
Yomna Nasser
f64dc309ac Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: ea343fa5a4 am: cc7d1df747 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I324006143b33deeca77021a6187ad7636588ad2e
 2021-08-17 00:56:43 +00:00
Yomna Nasser
e4bfb7de87 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: ea343fa5a4 am: 4ff69294a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: Ie79c34db0894229d263fd2361285e4eeb2391ea7
 2021-08-17 00:56:23 +00:00
Yomna Nasser
19c1eba133 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: 87259ab2af am: da6c658b99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I50a1f816db1831e0570c07878e963632c70c7d31
 2021-08-17 00:56:17 +00:00
Curtis Belmonte
7fb2316a21 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev 2021-08-17 00:47:58 +00:00
Curtis Belmonte
2b318b3b69 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp 
* changes:
  [automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
  Remove/replace old fingerprint icon in SUW/Settings
 2021-08-17 00:47:58 +00:00
Curtis Belmonte
562d29d081 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-mainline-prod 
* changes:
  [automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
  Remove/replace old fingerprint icon in SUW/Settings
 2021-08-17 00:47:58 +00:00
Yomna Nasser
cc7d1df747 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: ea343fa5a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I66ce87c90de8da8b288295dfbb7f9be0b05132fc
 2021-08-17 00:43:43 +00:00
Yomna Nasser
4ff69294a4 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: ea343fa5a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I357fb09a14d85c85fed75603da9f96aa44ff6786
 2021-08-17 00:43:41 +00:00
Yomna Nasser
da6c658b99 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: 87259ab2af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I3a5aa2741d2a8bb9495fb5e88b27d1248d60f7ef
 2021-08-17 00:43:26 +00:00
Yomna Nasser
4c7c958e02 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: 862a35d7fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I151a87339710d05d0f737b507ff911788b423455
 2021-08-17 00:42:56 +00:00