PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,029 Commits 1 Branch 0 Tags
a346e2540909adc012ecbdc4724ee4cf49a98ba4
Commit Graph

77029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Goldman
a346e25409 Merge "[Testing] AndroidJunit Enhanced4gLteSliceHelperTest" am: 37cfec7ac2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12581444

Change-Id: Idea435d0159dee37411361ee6231107a0a9637a8
 2020-09-21 04:07:48 +00:00
Jeremy Goldman
37cfec7ac2 Merge "[Testing] AndroidJunit Enhanced4gLteSliceHelperTest" 2020-09-21 03:46:18 +00:00
TreeHugger Robot
3f69f61dd3 Merge "Update state when there is Bluetooth tethering state changed" am: 660b17c7cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12554917

Change-Id: I98658bc18648393800e5cb19426650515a3baf81
 2020-09-21 03:45:09 +00:00
TreeHugger Robot
660b17c7cb Merge "Update state when there is Bluetooth tethering state changed" 2020-09-21 03:24:38 +00:00
TreeHugger Robot
5fb4f63d13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c4ae769663 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83a1e0c34ae97c44a8f2810e8410d5e47c87b27c
 2020-09-19 14:33:24 +00:00
TreeHugger Robot
c4ae769663 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-19 14:05:30 +00:00
TreeHugger Robot
79d7552ab1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4ac22e55fe -s ours am: 9e25089aee -s ours am: 93ded459c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55c0278ba514f34895f20c4f2c2ae6903a56c559
 2020-09-19 06:58:19 +00:00
TreeHugger Robot
e4b5438df1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f0548a3de2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3bfdfa293fb9b68c8fe00e33e1747f6e6d279ee0
 2020-09-19 06:58:13 +00:00
TreeHugger Robot
93ded459c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4ac22e55fe -s ours am: 9e25089aee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3df4c8e1feddfca02f8d86d037e2b6be775d4e74
 2020-09-19 06:43:36 +00:00
TreeHugger Robot
f0548a3de2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-19 06:38:04 +00:00
TreeHugger Robot
9e25089aee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4ac22e55fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c569b44137ea6efbd324021d06e876cf145e61b
 2020-09-19 06:25:36 +00:00
TreeHugger Robot
4ac22e55fe Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-19 05:30:57 +00:00
Bill Yi
f51db956eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc -s ours am: 46678afcad -s ours am: 420fdf0a89 -s ours am: 635ee82942 -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: I85551272a8b4c4f847adc3a6a0d9903c756c9e51
 2020-09-19 03:28:58 +00:00
Bill Yi
0d3ba12712 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc -s ours am: 15c3938b96 -s ours am: 014c717f5c -s ours am: 2050329575 -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: I107eb03c80248c659b8de622bf99d4e40b6478e0
 2020-09-19 03:28:22 +00:00
Bill Yi
635ee82942 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc -s ours am: 46678afcad -s ours am: 420fdf0a89 -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: If3376a63ff968e634973486749313b2cbc8d5e24
 2020-09-19 03:07:35 +00:00
Bill Yi
2050329575 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc -s ours am: 15c3938b96 -s ours am: 014c717f5c -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: I48edae6651653acfc9dd3c33350505b1477c1de4
 2020-09-19 02:57:13 +00:00
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
5693122b31 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie970dcf51fc443cc9d45c5f4ab89c9713f1b778c
 2020-09-18 18:49:59 -07: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
9a992c04fd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib5f2340e20be80d9d8e89858af8eb042c7ba444f
 2020-09-18 18:12:05 -07:00
Bill Yi
6fbc044374 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I05ee4abf21aa97acf518dbb3f7f1fec36a70445c
 2020-09-18 17:33:58 -07: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
Jeremy
1885f027d8 [Testing] AndroidJunit Enhanced4gLteSliceHelperTest 
Test: atest -c Enhanced4gLteSliceHelperTest
Change-Id: I548ffe60f00cea76d0c4af33ca4ec6f38cbf6247
 2020-09-18 15:30:41 -04:00
TreeHugger Robot
650533d6a2 Merge "Stop the ringtone when other seek bar is adjust" am: 74e3692ab9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12455467

Change-Id: I3a1137319851003f2498dddeee4c9b0b454ab1d9
 2020-09-18 17:10:07 +00:00
TreeHugger Robot
7504da2c9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0be898b31b -s ours am: 53fd973ae0 -s ours am: 9fca8b511a -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: I2f016fa64b601f6af63bd9844489037527ab1dcd
 2020-09-18 17:09:53 +00:00
TreeHugger Robot
0a84ac4f28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697d2e1fad -s ours am: aa6dc66b38 -s ours am: b6d718e3e3 -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: Iede276e5053c63f855b8fcd8acbc87da2c9011e3
 2020-09-18 17:09:43 +00:00
TreeHugger Robot
a1c3807c1e Merge "Create NetworkProviderSettings for provider model" am: b7d5c72d0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12509131

Change-Id: Ic156689c26315b1b2be8f2c1cd14266f1047f413
 2020-09-18 13:38:05 +00:00
Beth Thibodeau
dccc9ea3c4 [automerger skipped] Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."" into rvc-qpr-dev am: 7ca988cab1 am: 62384851e0 -s ours am: b02f236c08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795

Change-Id: Id90db7f3706b52c45a6ac3d65daed92fae99a28f
 2020-09-18 10:38:26 +00:00
Beth Thibodeau
f5ab97e04d [automerger skipped] [DO NOT MERGE] Revert "Allow user to block individual apps from resuming." am: 70920bd9ff am: 51499b2f51 -s ours am: cee72185f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795

Change-Id: I4fc0a7140e37d97e87c9c152d0be7e60f15772dc
 2020-09-18 10:38:23 +00:00
TreeHugger Robot
74e3692ab9 Merge "Stop the ringtone when other seek bar is adjust" 2020-09-18 07:53:08 +00:00
TreeHugger Robot
9fca8b511a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0be898b31b -s ours am: 53fd973ae0 -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: Ib4d4787fb18a321b47fd436800489f12d2b95353
 2020-09-18 06:11:18 +00:00
TreeHugger Robot
b6d718e3e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697d2e1fad -s ours am: aa6dc66b38 -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: I53769eed7f02c3ebd8ae71d8626e9348d367feb8
 2020-09-18 06:01:35 +00:00
TreeHugger Robot
b7d5c72d0f Merge "Create NetworkProviderSettings for provider model" 2020-09-18 05:08:08 +00:00
Beth Thibodeau
b02f236c08 [automerger skipped] Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."" into rvc-qpr-dev am: 7ca988cab1 am: 62384851e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab656363e6cda1b5803b95d8feffcdb74a77b0e6
 2020-09-18 04:06:42 +00:00
Beth Thibodeau
cee72185f6 [automerger skipped] [DO NOT MERGE] Revert "Allow user to block individual apps from resuming." am: 70920bd9ff am: 51499b2f51 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia660e91ac9030ad34e6b095826b760d6ff8052a0
 2020-09-18 04:06:38 +00:00
Jeremy Goldman
7e47b06b1e Merge "[Testing] AndroidJUnit4 NetworkSelectSettingsTest" am: d620baa3d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12563575

Change-Id: Ifcf81ef8e6b1ec0aa3e4f3fe4c667c67f17b140e
 2020-09-18 04:04:03 +00: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
Jeremy Goldman
d620baa3d7 Merge "[Testing] AndroidJUnit4 NetworkSelectSettingsTest" 2020-09-17 18:58:36 +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
Jeremy Goldman
7cb2738fdb [Testing] AndroidJUnit4 NetworkSelectSettingsTest 
Test: atest -c NetworkSelectSettingsTest
Change-Id: I1d842cd522df87d1cc762b50ae43e9efc723b154
 2020-09-17 16:08:33 +00:00
TreeHugger Robot
0151dd8a8a Merge "Fix the device on "Media devices" wouldn't update" am: a4161789d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12614864

Change-Id: I42570a91f3c9c177a4e5932b9291f14d216baa2d
 2020-09-17 14:17:37 +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