PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,861 Commits 1 Branch 0 Tags
10c930c4c0a400e38602087d4f26b331633e310f
Commit Graph

74861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
10c930c4c0 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -s ours am: 657e0f3008 -s ours am: 379ae6c7b8 -s ours am: 95e4eb59e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice308fc954cd91aee945e410bebfeb673bfc4f9a
 2020-09-21 08:27:58 +00:00
Bill Yi
762d039b47 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -s ours am: d50cfa9b63 -s ours am: 5ff5b3187c -s ours am: bd90a0d0ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b35900c07fa69407ec5bfa073a105db07e1d0a3
 2020-09-21 08:27:03 +00:00
Jeremy Goldman
37cfec7ac2 Merge "[Testing] AndroidJunit Enhanced4gLteSliceHelperTest" 2020-09-21 03:46:18 +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
c4ae769663 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-19 14:05:30 +00:00
Bill Yi
95e4eb59e4 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -s ours am: 657e0f3008 -s ours am: 379ae6c7b8 -s ours 
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history

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

Change-Id: Ia188911bc5dffe63a0dc7a576314efecb1b5ba05
 2020-09-19 08:01:56 +00:00
Bill Yi
bd90a0d0ff [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -s ours am: d50cfa9b63 -s ours am: 5ff5b3187c -s ours 
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history

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

Change-Id: I07395bbd3c6d17c709d7506df657025e0306adc3
 2020-09-19 08:01:02 +00:00
Bill Yi
379ae6c7b8 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -s ours am: 657e0f3008 -s ours 
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history

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

Change-Id: I9bffdf82e1739f2d962e3f5b5aa5369a45d0533b
 2020-09-19 07:01:22 +00:00
Bill Yi
5ff5b3187c [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -s ours am: d50cfa9b63 -s ours 
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history

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

Change-Id: I208048eb3581ea9f380b6e51a8f253106e942ece
 2020-09-19 07:00:56 +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
Bill Yi
657e0f3008 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -s ours 
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history

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

Change-Id: I0201d683bb94a0143cd81fa094993007aa7aad6d
 2020-09-19 05:51:28 +00:00
Bill Yi
d50cfa9b63 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -s ours 
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history

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

Change-Id: I4463fa09a3cc3cd986293a03a0cd8424cfa20a41
 2020-09-19 05:50:34 +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
e7038aa1a3 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073

Change-Id: I5307234cb034d2f255307cbcff5ebee1a470d79b
 2020-09-19 05:23:11 +00:00
Bill Yi
5d7f242557 Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073

Change-Id: I0c107d09b4793a6c16b86a559bebc1a5e92e6e96
 2020-09-19 05:22:34 +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
Bill Yi
94c8353286 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" 2020-09-18 18:47:53 +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
Bill Yi
48a84d855f Merge mainline-release 6664920 to master - DO NOT MERGE 
Merged-In: Ifa4dc400eb8c87c2514a3629288657520476fbfd
Change-Id: Ib4c9dcb035b9b3e6168309d6d85a310c10e987af
 2020-09-17 21:57:11 -07: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
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
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
TreeHugger Robot
a4161789d6 Merge "Fix the device on "Media devices" wouldn't update" 2020-09-17 11:32:12 +00:00
Hugh Chen
cafeab2813 Fix the device on "Media devices" wouldn't update 
- This CL use new CachedBluetoothDevice callback instance
  in construct to avoid unregister wrong callback.
- This CL use flag to make sure preference will register
  callback on onAttached() when preference remove callback
  on onPrepareForRemoval() or onDetached().
- Update test case

Bug: 168682778
Bug: 157653997
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a0d9f5332153ee80634e191847b84cd7c380b7d
 2020-09-17 08:45:12 +00:00