PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,138 Commits 1 Branch 0 Tags
420fdf0a89dee5cf25c98ae123ae6e433bd6722e
Commit Graph

71138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
420fdf0a89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc -s ours am: 46678afcad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6292129f399ab3e9d68176c73be4e98902028b70
 2020-09-19 02:27:11 +00:00
Bill Yi
014c717f5c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc -s ours am: 15c3938b96 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3613bf5148830f5ce78e4bfd7ce1d286fa23cb16
 2020-09-19 02:25:55 +00:00
Bill Yi
46678afcad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75912992dfd44e72c3e8daf2721be656dbc114b9
 2020-09-19 01:49:34 +00:00
Bill Yi
15c3938b96 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a8a7ada0c4b307ec2088f21037fd7e3696d5684
 2020-09-19 01:47:35 +00:00
Bill Yi
1d033b41dc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2553421a8fef1330908cba8afc10013ce6331778
 2020-09-18 16:54:49 -07:00
TreeHugger Robot
53fd973ae0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0be898b31b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29e5d492b9ed5b2977c20a9357b7be78cbf513b1
 2020-09-17 19:14:06 +00:00
TreeHugger Robot
aa6dc66b38 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697d2e1fad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a2d9116459ef22917eb56baae0f8d30eea9f929
 2020-09-17 19:12:46 +00:00
Beth Thibodeau
62384851e0 Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."" into rvc-qpr-dev am: 7ca988cab1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795

Change-Id: I8e7a6c1974a2cd78438bcaa79ee003c787133aa9
 2020-09-17 19:12:18 +00:00
Beth Thibodeau
51499b2f51 [DO NOT MERGE] Revert "Allow user to block individual apps from resuming." am: 70920bd9ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795

Change-Id: I4019b79c2ee725d518ff9c7b6714bda772133d47
 2020-09-17 19:12:14 +00:00
TreeHugger Robot
0be898b31b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-17 18:27:09 +00:00
TreeHugger Robot
697d2e1fad Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-17 18:20:10 +00:00
Beth Thibodeau
7ca988cab1 Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."" into rvc-qpr-dev 2020-09-17 17:56:29 +00:00
Beth Thibodeau
70920bd9ff [DO NOT MERGE] Revert "Allow user to block individual apps from resuming." 
Revert submission 12392268-cherrypick-mediaappsettings-5fxuo164a2

Bug: 161813143

Reason for revert: no longer want change in QPR
Reverted Changes:
Id3de52419:Allow user to block individual apps from resuming....
I8c85bc937:Allow user to block individual apps from resuming

Change-Id: Ieacef217587476532246b466d680219351bc1657
 2020-09-17 17:55:56 +00:00
Bill Yi
17d8f4e53a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic2d693eb2a6060bd39063cd1e1b6a677c555a500
 2020-09-17 13:36:15 +00:00
Bill Yi
fc1e97b985 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I808f46f1aaebeccdfd1bf4c0c561925830b97717
 2020-09-17 13:01:33 +00:00
Jiashen Wang
6538ee53cf Do not display eSIM activation option if the device is eSIm ignored am: f537a702dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620221

Change-Id: If39f36992de53f89ce07ef5ff1ddb597800dff58
 2020-09-17 02:27:04 +00:00
Jiashen Wang
f537a702dd Do not display eSIM activation option if the device is eSIm ignored 
For the device listed as eSIM ignored device, we should always hide the
eSIM activation button even in the developer mode.
Bug: 168266928
Test: Manually tested

Change-Id: Ide3043606de202c5903e520aa550302ff0d103d3
 2020-09-16 15:33:51 -07:00
TreeHugger Robot
cdf6fb31f0 Merge "Fix settings crash" into rvc-qpr-dev am: 19af143fe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523486

Change-Id: I3de2dab20767ae2e3a132cf611b85b77cbe1fc56
 2020-09-16 03:43:32 +00:00
TreeHugger Robot
e8b47df453 Merge "Show just disconnected device on previously connected" into rvc-qpr-dev am: 2b52c56eac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493714

Change-Id: Ic3f113e706c9fe3f74eb61a2b980df9a271d806a
 2020-09-16 03:42:54 +00:00
TreeHugger Robot
19af143fe7 Merge "Fix settings crash" into rvc-qpr-dev 2020-09-16 03:09:38 +00:00
TreeHugger Robot
2b52c56eac Merge "Show just disconnected device on previously connected" into rvc-qpr-dev 2020-09-16 03:09:30 +00:00
TreeHugger Robot
9dc594b90d Merge "Show all devices, including connected ones, into "Previously connected" page" into rvc-qpr-dev am: a21c26df38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493713

Change-Id: I2bd0c2be1c9d9856f568df93339d526d1fed145a
 2020-09-15 10:21:23 +00:00
Arc Wang
84ac360560 Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController" into rvc-qpr-dev am: b576c802fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109

Change-Id: I1831acc1db85fbf374a927897d0a57d29f43c2f0
 2020-09-15 10:20:55 +00:00
Arc Wang
3782ff7edd [DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController am: d785fbab68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109

Change-Id: I862192e840cbf25f8fe713b243fd17a054906c16
 2020-09-15 10:20:53 +00:00
TreeHugger Robot
a21c26df38 Merge "Show all devices, including connected ones, into "Previously connected" page" into rvc-qpr-dev 2020-09-15 09:54:08 +00:00
Bonian Chen
5d1da01e80 Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b am: 49936c5eb5 am: ccc406381a am: 3864e2f218 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810

Change-Id: I3223c2748176ebd6624ce3b7f66dbd76c4b0bd88
 2020-09-15 09:34:01 +00:00
Arc Wang
b576c802fd Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController" into rvc-qpr-dev 2020-09-15 09:30:12 +00:00
Bonian Chen
3864e2f218 Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b am: 49936c5eb5 am: ccc406381a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810

Change-Id: I65499d47dfa6b2905f65bcf6729f4f5e2ab02af9
 2020-09-15 09:09:28 +00:00
TreeHugger Robot
bf4a795692 Merge "Display "pair new" only when local output device is available." into rvc-qpr-dev am: eacabd567f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493712

Change-Id: I1ef85337bfd34f3a78e1d1191d9fd6307d2f6f14
 2020-09-15 08:41:20 +00:00
TreeHugger Robot
2dfac98e04 Merge "Display "see all" option when bluetooth is off" into rvc-qpr-dev am: c21ad3649e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392571

Change-Id: Idc4c231882c8868bf6970f19f5bc73b391302ef1
 2020-09-15 08:40:43 +00:00
Bonian Chen
ccc406381a Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b am: 49936c5eb5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810

Change-Id: Ifa4dc400eb8c87c2514a3629288657520476fbfd
 2020-09-15 08:40:08 +00:00
TreeHugger Robot
eacabd567f Merge "Display "pair new" only when local output device is available." into rvc-qpr-dev 2020-09-15 08:17:15 +00:00
TreeHugger Robot
c21ad3649e Merge "Display "see all" option when bluetooth is off" into rvc-qpr-dev 2020-09-15 08:01:48 +00:00
Bonian Chen
49936c5eb5 Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810

Change-Id: I27c52df26b156a041cbee79386c388738c6e46c5
 2020-09-15 07:37:06 +00:00
Bonian Chen
f5fa52884b Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" 2020-09-15 07:09:12 +00:00
changbetty
8de635ea7b [Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context

Bug: 162048313
Test: atest -c MobileDataEnabledListenerTest
Merged-In: I81b3d6ac075666a45649c8d811832a40bdb1b41b
Change-Id: I34687eb69ef62cd3b6ea6519cee608a7b95f242b
 2020-09-15 12:24:10 +08:00
Bill Yi
76798cd54a [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -s ours am: 46cde30768 -s ours am: fe8f27e508 -s ours 
am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9 is in history

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

Change-Id: Id398169928129db8dee129867cdd0664c02f7fa6
 2020-09-14 22:20:14 +00:00
Bill Yi
fe8f27e508 [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -s ours am: 46cde30768 -s ours 
am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9 is in history

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

Change-Id: Id45eaae95313fb02d2fe6ee17507828a8a9f69d9
 2020-09-14 21:50:54 +00:00
Bill Yi
46cde30768 [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -s ours 
am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9 is in history

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

Change-Id: Icfb9e9a3074558ecbfb6f2a41c8b0cf0da133dc5
 2020-09-14 21:18:52 +00:00
Arc Wang
d785fbab68 [DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController 
WifiConnectionPreferenceController only shows when there are 2 SIMs,
it shows the connected Wi-Fi network.

WifiConnectionPreferenceController does not use WifiPickerTracker
to get a WifiEntry key. It should not launch WifiNetworkDetailsFragment2
which uses a WifiEntry key to find a WifiEntry.

Bug: 168280554
Test: manual
      1. Make MultiNetworkHeaderController available.
      2. Settings -> Network & internet -> click connected Wi-Fi
      3. See Wi-Fi Details
Change-Id: I2acea3564d2d89fe8e120064b33ef342c97edb60
 2020-09-15 01:03:13 +08:00
Bill Yi
de75424d55 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bf99f9c34a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35bc7cae4aaf07065047079369cfe0c2650dfb70
 2020-09-14 02:21:10 +00:00
Bill Yi
bf99f9c34a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic5e9637ae3803ba74454583f4425cef0f5abcd62
 2020-09-13 20:54:27 +00:00
Bill Yi
c9fae4d80e Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE 
Merged-In: I5c0fe4b0b3be7191d42db14195791d8a8bee503c
Change-Id: I630901126dc42830b8c36ffd9c22d0b903826704
 2020-09-13 07:58:53 -07:00
Treehugger Robot
ae268ea40d Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 am: 368ae3f9b9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: I30981eb4d451fc77ba7ee08b9ad734a392c27fca
 2020-09-12 03:02:52 +00:00
Treehugger Robot
368ae3f9b9 Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: Idd7fbf0b35260a8146d029337cb3de7d29a14ed8
 2020-09-12 02:21:21 +00:00
Treehugger Robot
91286c4ec9 Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: I5c0fe4b0b3be7191d42db14195791d8a8bee503c
 2020-09-12 01:36:43 +00:00
Treehugger Robot
26f8b54e38 Merge "Add goldmanj to settings owners files." am: 56349f714d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: Ic5d53fe6e4a19519b572afb5814f3ff3a3b6cc5b
 2020-09-12 01:09:51 +00:00
Treehugger Robot
56349f714d Merge "Add goldmanj to settings owners files." 2020-09-12 00:24:02 +00:00
Quang Luong
8704114f02 Merge "[Wi-Fi] Show Pie+x Wi-Fi icon when a connected Wi-Fi is not default route" into rvc-qpr-dev am: db667a8971 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12444567

Change-Id: I655406b69ef689a1b604ed6fc6c9e4d2bbf8bf82
 2020-09-11 18:57:42 +00:00
Jeremy Goldman
9e1e47fef7 Add goldmanj to settings owners files. 
Test: N/A, code not edited.
Change-Id: I23a64e52d01ebeda1509d1e207200d868444d955
 2020-09-11 18:55:46 +00:00