PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,455 Commits 1 Branch 0 Tags
fe8c04d952fb20af9881e63c9b8483ad5131bdbc
Commit Graph

96455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7378aac868 Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-27 14:33:16 +00:00
Bill Yi
f291d21a60 Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-27 14:33:16 +00:00
Bill Yi
88e6492f12 Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b 2p: f40f1d1d7d
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-27 14:33:16 +00:00
Bill Yi
622e9f3aac Merge changes from topic "presubmit-am-0a687c09fd19447bb5c186f32a2cd11e" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f1ef62bc4a
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-27 14:30:36 +00:00
ykhung
68421b5df8 [S-QPR1] add package name for enable/disable app user actions metric 
add package name into the metric per @wangkelly request to analyze users behavior in the battery setting relative CUJ:
go/battery-setting-enums
go/battery-setting-metrics-dev

Bug: 199807285
Test: make SettingsRoboTests
Change-Id: Ica6da59b933b0dcff940215d4e537a670bac52cb
(cherry picked from commit e12712dd1d)
 2021-09-27 12:59:55 +00:00
Arc Wang
8524de9911 Merge "[Large screen] Show full screen CreateShortcutActivity" into sc-v2-dev am: d749c4eadf am: 0f9f5056d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919134

Change-Id: I65294f9d595eaca88107db85b272468964cbf77f
 2021-09-27 12:14:33 +00:00
Arc Wang
0f9f5056d0 Merge "[Large screen] Show full screen CreateShortcutActivity" into sc-v2-dev am: d749c4eadf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919134

Change-Id: Ibd8b3c84ecdcc881e9c9e92f75792cba02f41dcc
 2021-09-27 12:00:18 +00:00
Arc Wang
d749c4eadf Merge "[Large screen] Show full screen CreateShortcutActivity" into sc-v2-dev 2021-09-27 11:50:40 +00:00
ykhung
22e637bfc9 [S-QPR1] protect gettinng battery stats from DeadSystemException 
In some corner cases, we will receive the DeadSystemException from
BatteryStatService when invoking getBatteryUsageStats() method, since it
will encounter the binder transaction too large error. Before the root
cause is resolved by the BatteryStatService team, we have to add
workaround protection in the app side to avoid Setting is crashed.

Bug: 191237968
Bug: 198084535
Test: make SettingsRoboTests
Change-Id: I783479241bac83b4afc8ced3073e1b1db302c48c
Merged-In: I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47
 2021-09-27 09:57:41 +00:00
Arc Wang
3e8164647c [Large screen] Show full screen CreateShortcutActivity 
Show full screen for CreateShortcutActivity because

-Launcher startActivityForResult for Intent.ACTION_CREATE_SHORTCUT and
 activity stack starts from launcher, CreateShortcutActivity will not
 follows SplitPaitRule registered by Settings.

- There is no CreateShortcutActivity entry point from Settings app UI.

Bug: 200916507
Test: manual
      Launcher menu ->  Widgets -> Settings -> select an item.
      Observe if it goes back go launcher.
Change-Id: I437ff9b82d5a4548e10aed7bd083fd01352433f4
 2021-09-27 17:44:41 +08:00
Bill Yi
bb1fa59ee0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6 -s ours am: 1935982f0c -s ours am: b4c0945299 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79b3a93c6d75d0c71b8661652e1105f2453836a9
 2021-09-27 07:26:25 +00:00
TreeHugger Robot
ac36574156 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 33e5bdd34d -s ours am: e5f93b6af4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8246233523b2ca77c1b31e8db27a4d5db3c689e6
 2021-09-27 07:24:55 +00:00
Bill Yi
b4c0945299 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6 -s ours am: 1935982f0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie60f0581a87d67d79eed2d953f14b0b2f35a2f38
 2021-09-27 07:24:53 +00:00
Peiyong Lin
c7e5181619 Merge "Update string to avoid using etc." 2021-09-27 07:10:57 +00:00
TreeHugger Robot
e5f93b6af4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 33e5bdd34d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9174c81e21e280ca54d923ac7512511eb1a6828
 2021-09-27 07:05:30 +00:00
Bill Yi
1935982f0c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0cefaafdf0478a4c4d6cb92ace0e14c2d5cea3b2
 2021-09-27 07:05:26 +00:00
TreeHugger Robot
33e5bdd34d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-27 06:52:41 +00:00
TreeHugger Robot
c8e9493a06 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-09-27 06:47:04 +00:00
Yanting Yang
e2550c777a Merge "Fix crash of PictureInPictureDetailPreferenceController" into sc-v2-dev am: 2129ea5947 am: 8269df988f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895167

Change-Id: Ifb661042222a49700a0eed8007f207cf1202647b
 2021-09-27 03:24:06 +00:00
jasonwshsu
f03f6e2326 [automerger skipped] Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest am: 77dfb35922 am: 91a147ff71 -s ours 
am skip reason: Merged-In I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39 with SHA-1 2d3894a148 is already in history

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

Change-Id: I04a7ef4a42b3c23d16e51084bc0fce8ee993810c
 2021-09-27 03:24:01 +00:00
Yanting Yang
8269df988f Merge "Fix crash of PictureInPictureDetailPreferenceController" into sc-v2-dev am: 2129ea5947 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895167

Change-Id: I70e9abf03d0985c7e327692a96b66fc731978b1f
 2021-09-27 03:09:48 +00:00
jasonwshsu
91a147ff71 Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest am: 77dfb35922 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915645

Change-Id: Ibf00f3e9d071fe210f2b2f4aacd02c762f1121a9
 2021-09-27 03:09:41 +00:00
Yanting Yang
2129ea5947 Merge "Fix crash of PictureInPictureDetailPreferenceController" into sc-v2-dev 2021-09-27 03:04:02 +00:00
jasonwshsu
77dfb35922 Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest 
Root Cause: The lifecycle for
AccessibilityShortcutPreferenceFragmentTest did not be called correctly.

Solution:
* Call onAttach() before onCreate() to set some configs correctly, e.g.
FeatureFactory.
* Use ShadowFragment.class that we usually do in accessibility
tests.

Fix: 200906425
Fix: 201020915
Test: atest AccessibilityShortcutPreferenceFragmentTest
Change-Id: I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39
Merged-In: I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39
 2021-09-27 02:04:43 +00:00
Daniel Solomon
5a02e48902 Update BrightnessInfo constructor usage 
Bug: 200851199
Test: atest DisplayModeDirectorTest BrightnessLevelPreferenceControllerTest
Change-Id: I37593443b3d7eb314f8c4970711e4d4d6f39c6ea
 2021-09-26 16:14:09 -07:00
Bill Yi
b28191e3c0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If7b2a0c1b711f75dfd5dd0f89cbf0cd5776bc5cc
 2021-09-26 04:42:16 +00:00
Bill Yi
49ce6473d6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7c1879f0724a02c587b898e68ef9161871561431
 2021-09-26 04:38:29 +00:00
Bill Yi
d4fd4832c3 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b 2p: f40f1d1d7d 
Blank merge reason: parent was merged -s ours

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

Change-Id: Ibff510226484db953450d86fc4e09d9a577ac7aa
 2021-09-26 04:35:11 +00:00
Bill Yi
7245d9f02a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b 
Blank merge reason: commit message contains skip directive

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

Change-Id: I8aef99f96568cb302d895a18e5a1806da044701f
 2021-09-26 04:35:06 +00:00
Bill Yi
fe3544e435 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib81043858abd402fcc9e4b0cdfa856ca2a26b3ba
 2021-09-26 04:35:06 +00:00
Bill Yi
f40f1d1d7d [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib20ad6dd4ea8be51db239ee622066fe5038b596b
 2021-09-26 04:35:06 +00:00
Bill Yi
92e5e1d54b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I116288a1e6ca78f8cd87f40b7a83de262b7b4449
 2021-09-26 04:34:53 +00:00
Bill Yi
929617da1d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I295b832ffbcdfc325dc0748da1c5994bbc464430
 2021-09-26 04:30:59 +00:00
Bill Yi
3dbcf72272 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f1ef62bc4a 
Blank merge reason: commit message contains skip directive

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

Change-Id: If6b84bc029873d9dcfa69a576a22fb3015e9019f
 2021-09-26 04:20:25 +00:00
Bill Yi
f1ef62bc4a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5b5687272886ed70438839901265a2cc1f5ef14a
 2021-09-26 04:20:15 +00:00
jasonwshsu
2d3894a148 Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest 
Root Cause: The lifecycle for
AccessibilityShortcutPreferenceFragmentTest did not be called correctly.

Solution:
* Call onAttach() before onCreate() to some config, e.g.
FeatureFactory.
* Use ShadowFragment.class that we usually do in accessibility
tests.

Fix: 200906425
Fix: 201020915
Test: atest AccessibilityShortcutPreferenceFragmentTest
Change-Id: I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39
 2021-09-26 03:16:57 +08:00
Bonian Chen
89abc263e0 Merge "[Settings] Enable kotlin language support" 2021-09-24 23:54:54 +00:00
Julia Reynolds
46d1d28ae6 Always return the same result code in access screens am: 1aff9c726a am: e21284e8d9 am: eba8afd3e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133

Change-Id: I62c0fb6dce6e2d7d0254868cabe009d5acf4a4fb
 2021-09-24 20:02:07 +00:00
Julia Reynolds
eba8afd3e6 Always return the same result code in access screens am: 1aff9c726a am: e21284e8d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133

Change-Id: I264b8cb65037681c6e48f5435e5da6a590207dc3
 2021-09-24 19:49:33 +00:00
Julia Reynolds
e21284e8d9 Always return the same result code in access screens am: 1aff9c726a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133

Change-Id: Ib1df91f97e9dd60cf13871db1eef62e4180d7e95
 2021-09-24 19:35:14 +00:00
Bill Yi
f60ba12e3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d40bcd0e00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8699e6acc077403a91de908c904d69a8a4f69762
 2021-09-24 19:00:37 +00:00
Bill Yi
d40bcd0e00 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-24 18:45:12 +00:00
Bill Yi
e76b048986 Merge changes from topic "presubmit-am-2e911009bb20437f88021e323ead1dab" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d74f4b3d
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 18:45:12 +00:00
Bill Yi
f33c6cb54e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours am: b01a8ddd0f -s ours am: 1b275d9c03 -s ours am: 4d4867a662 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9b64f4381fb31a5b25747968f50695e89318f13
 2021-09-24 18:30:39 +00:00
Bill Yi
285e30a8eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours am: 17eccfd048 -s ours am: c6fad452b9 -s ours am: bfc00fd27f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea09c767493f0bc09a664d04bd5a4461d93e207f
 2021-09-24 18:30:33 +00:00
Bill Yi
3b1879c08a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours am: 7e253fafe9 -s ours am: b61ad9bd03 -s ours am: 4d6fcaaf8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6106504d2598df7bd18d4c2dfa7f0826b211dc1a
 2021-09-24 18:30:15 +00:00
Bill Yi
6263362f6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours am: ee7f088a94 -s ours am: ffc08e5492 -s ours am: a0f58ae81b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id072be2d9ce2a4e07badb732275500d9416f7c61
 2021-09-24 18:29:32 +00:00
Bill Yi
d1c7bb077a Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac am: 0522bb8e22 am: 813cd1750b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: I393434a118480c218d8ab4f12430c0952f15412b
 2021-09-24 18:28:54 +00:00
Bill Yi
c03ba19e0f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f am: c038db5354 -s ours am: fb5a956797 -s ours am: 6ccfefd14e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifeb0216bacf0853c61a8a1d4bfdc901db463faac
 2021-09-24 18:28:51 +00:00
Bill Yi
3e8e6ee696 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417 am: fd934ec1ee am: fee49424c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: Ie333a3f85c1a5bb67fe83b8a90a19b548d7a7225
 2021-09-24 18:26:21 +00:00