Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,957 Commits 1 Branch 0 Tags
d7ae5d8bbddbb6b7a6f49d5eaca4478b8e8317e5
Commit Graph

83957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d7ae5d8bbd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59205fce57 -s ours am: 93d2962588 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3041d14c3dd75382456e27eea06dc2dca03d05d1
 2021-06-15 15:14:24 +00:00
TreeHugger Robot
0ebd46296e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f50af259f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8725f9c5b6f7044211386a50ee89504c94ca7617
 2021-06-15 15:14:04 +00:00
TreeHugger Robot
13221f4192 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: de9d41cbf3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80cdcf3dff9c16230b0b92eb947f46768f724fc3
 2021-06-15 15:13:37 +00:00
TreeHugger Robot
93d2962588 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59205fce57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8396363e05002a19f16293d8258ba2f8d11839ee
 2021-06-15 15:13:32 +00:00
TreeHugger Robot
59205fce57 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-15 14:56:52 +00:00
TreeHugger Robot
f50af259f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-15 14:55:23 +00:00
TreeHugger Robot
de9d41cbf3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-15 14:50:11 +00:00
Zimuzo Ezeozue
b9c965f011 Merge "Turn off transcoding notification by default" into sc-dev am: 653e7c91c8 am: 791f95c8a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964377

Change-Id: I2530be9999a5be8ee44b8f320d86b705776fe8b9
 2021-06-15 14:09:34 +00:00
Zimuzo Ezeozue
cffa3a670a Merge "Turn off transcoding notification by default" into sc-dev am: 653e7c91c8 am: 0d7177ec77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964377

Change-Id: I3f7a5f77467148eef94c560d72c4cd1e30b87ac2
 2021-06-15 14:09:15 +00:00
Zimuzo Ezeozue
0d7177ec77 Merge "Turn off transcoding notification by default" into sc-dev am: 653e7c91c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964377

Change-Id: Ic154883cd65ff1a45afecd54670211ce6f01b1b5
 2021-06-15 14:00:07 +00:00
Zimuzo Ezeozue
791f95c8a7 Merge "Turn off transcoding notification by default" into sc-dev am: 653e7c91c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964377

Change-Id: Ifb289ac030f62f3963a81c1808c80ada47c574c5
 2021-06-15 13:59:17 +00:00
Bill Yi
a4c6739489 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia06fc82725960767bbbda83b4c51aed746ae4968
 2021-06-15 13:54:43 +00:00
Zimuzo Ezeozue
653e7c91c8 Merge "Turn off transcoding notification by default" into sc-dev 2021-06-15 13:49:19 +00:00
Bill Yi
061292144e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icfd19de01cd116b105b5d947d41d13b4c58baa5f
 2021-06-15 13:43:16 +00:00
Bill Yi
94ab13af15 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8ed8b655dd1025abc355482a2b85489c47f8cb6e
 2021-06-15 13:41:45 +00:00
Menghan Li
517f079236 Merge "Add strings for use accessibility gesture" into sc-dev am: 92aaef1dac am: a9a5876ed6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934763

Change-Id: I7a34dba5c82d6b740a6461934ae6f5514c8d9f83
 2021-06-15 13:02:34 +00:00
TreeHugger Robot
3a9ec7bff2 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066 am: 5ea704f690 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828

Change-Id: I4260dc868c2b087549fe5d8f53107cb4550c784c
 2021-06-15 13:02:29 +00:00
Menghan Li
d50f10e3e8 Merge "Add strings for use accessibility gesture" into sc-dev am: 92aaef1dac am: b4792f2f69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934763

Change-Id: Ieb7c2a201c8ce3af65dfab6a91fdb61952f62906
 2021-06-15 13:02:12 +00:00
TreeHugger Robot
fe4f630ac5 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066 am: 1250d8e5b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828

Change-Id: I333452187dd8148b46e74ed94fb02fb16b6ace26
 2021-06-15 13:01:59 +00:00
Menghan Li
b4792f2f69 Merge "Add strings for use accessibility gesture" into sc-dev am: 92aaef1dac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934763

Change-Id: Ibae55a27a309f3fcd96846f5ca25a7bdbc5cfdf1
 2021-06-15 12:50:22 +00:00
TreeHugger Robot
1250d8e5b8 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828

Change-Id: Iff9a36424bb8db246b8fb8018cde20d19b483b67
 2021-06-15 12:50:06 +00:00
Menghan Li
a9a5876ed6 Merge "Add strings for use accessibility gesture" into sc-dev am: 92aaef1dac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934763

Change-Id: I8eabff5bcc8d970546feb24df3391c04c29f745f
 2021-06-15 12:49:27 +00:00
TreeHugger Robot
5ea704f690 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev am: ab04f86066 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964828

Change-Id: Ia5b3b52894f3df2b4e3bdf655a98e61b94425e9c
 2021-06-15 12:49:20 +00:00
Menghan Li
92aaef1dac Merge "Add strings for use accessibility gesture" into sc-dev 2021-06-15 12:43:16 +00:00
TreeHugger Robot
ab04f86066 Merge "[Provider Model] Remove Wi-Fi disconnect action" into sc-dev 2021-06-15 12:36:38 +00:00
Automerger Merge Worker
c43ed2759b Merge "Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff am: 394955220f" into sc-v2-dev-plus-aosp 2021-06-15 11:51:57 +00:00
Syaoran Kuo
76cab26187 Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff am: 394955220f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: Ifb919f496a58b400ce5cd09796d6b4f6caa21252
 2021-06-15 11:51:53 +00:00
Syaoran Kuo
e530f19b74 Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff am: db65894caa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: Ib54ed9d6c729716f138d0a3de11da63fe3063230
 2021-06-15 11:51:52 +00:00
Syaoran Kuo
db65894caa Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: I2e8581960e9fce769d0a8fde057d8582cbd22c2b
 2021-06-15 11:36:58 +00:00
Syaoran Kuo
394955220f Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: Ie1a623195806655f7f80832ad2d86d3865dd991a
 2021-06-15 11:36:12 +00:00
Peter Wang
855cf531ca Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 am: 130ac0729b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I050c1d75ae0ab0160fb20c6159c3de9b236a57f4
 2021-06-15 11:27:34 +00:00
Peter Wang
cd70049ff7 Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 am: 6117cfbaad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I97bcffcda53455156bfb9cc818250638c227b30a
 2021-06-15 11:27:25 +00:00
Syaoran Kuo
66eaa371ff Merge "Fix resource id not match issue." into sc-dev 2021-06-15 10:48:58 +00:00
Peter Wang
6117cfbaad Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I18ce09ecc9cebe0424f564c587d27545b7e58b47
 2021-06-15 10:19:10 +00:00
Peter Wang
130ac0729b Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I0d1c251e892da779e70c5078cb7cd22af754dd87
 2021-06-15 10:18:22 +00:00
Peter Wang
03d2f8d749 Merge "Use BC theme for ChooseSimActivity" into sc-dev 2021-06-15 10:02:34 +00:00
TreeHugger Robot
198496fc58 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da am: 37a2aed385 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: If7082e6ff25efbfc1173a9c699eda3a2146461e5
 2021-06-15 09:53:06 +00:00
TreeHugger Robot
8ff91653de Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e am: 72ce05c82e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: Ief9e494c4e941be26f57f6aeef146d1a41bc4411
 2021-06-15 09:52:44 +00:00
TreeHugger Robot
bc015dec40 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da am: 57c1cb6209 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: I20ea3c6483c6fdd9f319220ae4f744861c652bed
 2021-06-15 09:49:13 +00:00
TreeHugger Robot
3ba09390a3 Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e am: c497a9602b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I01e7f9c62335f2c5fd7ab943a5de9db02b687b3f
 2021-06-15 09:49:05 +00:00
Weng Su
58a651566f [Provider Model] Remove Wi-Fi disconnect action 
Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: I964bf8de4f5eee1523943876567bf565ccb7f995
 2021-06-15 17:43:31 +08:00
TreeHugger Robot
37a2aed385 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: Icb4cafb51fe77a836b2cfa7dae1dd2cd382715a5
 2021-06-15 09:36:59 +00:00
TreeHugger Robot
72ce05c82e Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I955d19d4ec913270fb6441f26e8d7dd2ca411b42
 2021-06-15 09:36:51 +00:00
TreeHugger Robot
57c1cb6209 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: I8757ccca71cf6efd33dc8b3f539fad4dadd35ff1
 2021-06-15 09:36:10 +00:00
TreeHugger Robot
c497a9602b Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I700f9a5a773862358e19ded911f634962571aa4f
 2021-06-15 09:36:04 +00:00
TreeHugger Robot
eb6ef210bb Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2 am: 339c1b5d12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: Iee48abc1660cce344c899ce131774fe4dadf8e0f
 2021-06-15 09:32:36 +00:00
TreeHugger Robot
109ef014d6 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2 am: c567927880 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I3ce0e11180b9fb6b30d1c6bed310746355ddc9dc
 2021-06-15 09:32:08 +00:00
TreeHugger Robot
2ff8b363da Merge "Add loading progress to Internet Settings" into sc-dev 2021-06-15 09:24:27 +00:00
TreeHugger Robot
1ce0d1117e Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev 2021-06-15 09:23:58 +00:00
TreeHugger Robot
c567927880 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I1a58e0c64d0d9f86c8d048b672299d85f3da8429
 2021-06-15 09:20:02 +00:00