PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,146 Commits 1 Branch 0 Tags
3eba8ba7f3ce3a24e02593c7a96d0f998a15e4db
Commit Graph

103146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2c5a30e12e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia8b418f650d3f7293387d1b37aa9cd858d5109f0
 2022-04-06 23:55:44 +00:00
Bill Yi
c1331e924b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I58b40d425fb2331cc26e1a22db597ed2b418e618
 2022-04-06 23:54:00 +00:00
Bill Yi
cc1f1b5e6e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8b31bb16c8e1a7dead3d302b15db20d7a4031bfe
 2022-04-06 23:45:35 +00:00
Bill Yi
642b7a74ba [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 65fd2107ef 
Blank merge reason: commit message contains skip directive

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

Change-Id: I6ddb6ffcfa82389ff6c2545d254fecb267c2faf2
 2022-04-06 23:42:06 +00:00
Bill Yi
65fd2107ef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ied44f5fe1916711c2935c9fc8ebd58af9ab529c1
 2022-04-06 23:41:51 +00:00
Bill Yi
00134be7d1 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47e0304cea 2p: 7f85a55285 
Blank merge reason: parent was merged -s ours

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

Change-Id: Ie5c711966d5cb09598fca4d6bfa4d0b298f603ef
 2022-04-06 23:40:45 +00:00
Bill Yi
7f85a55285 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62dd76e7d4 2p: 47e0304cea 
Blank merge reason: parent was merged -s ours

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

Change-Id: I98135d67554fd082c3b170346a0e9cf950d87b83
 2022-04-06 23:40:38 +00:00
Bill Yi
47e0304cea [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62dd76e7d4 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iff713f75feef96eb93b863847cb996f0e709bf94
 2022-04-06 23:40:28 +00:00
Bill Yi
62dd76e7d4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib47f53297c83360071064bfed2de9c5b2c0ec7a3
 2022-04-06 23:40:15 +00:00
TreeHugger Robot
88fe2e4406 Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c am: cd10b0552e am: 5cb554d02a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Change-Id: Ic92efd720f0048957ee7c0bcecb3a67045d7c6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 16:18:47 +00:00
Xiaowen Lei
52592d050d Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 am: da1f3d6d37 am: 8621b2d7f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17543375

Change-Id: I25baf58fb3c9a508dd5304c2c68e326f2a5867a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 16:17:49 +00:00
TreeHugger Robot
ecebcbde08 Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b am: 3a23af64cd am: 46d9aeee40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: I06395edf00ab4301b06dffa63aef59c5a90664f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 16:16:54 +00:00
Chaohui Wang
0fed939ff1 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f am: 631c56fc20 am: ec331ee2d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: I7fd7d53790312d24e2b052d5de79c240e8494a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 16:15:10 +00:00
TreeHugger Robot
0156b57ab5 Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c am: 0328978e63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Change-Id: I87faf9d9ac117e288332fb0c0f1663e7d95ee633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:57:09 +00:00
TreeHugger Robot
5cb554d02a Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c am: cd10b0552e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Change-Id: Ia1c8562a066bf568be5c3702f9ff4d413f522096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:56:33 +00:00
Xiaowen Lei
8621b2d7f7 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 am: da1f3d6d37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17543375

Change-Id: Ia6c1ab4e9663033226651ee700877edaacdee55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:56:22 +00:00
TreeHugger Robot
3d3daa37b0 Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" into tm-mainline-prod am: 8f16b0cd5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Change-Id: I7f96d689aad11fefa8d0a600e3cefa41c2326dac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:56:19 +00:00
TreeHugger Robot
46d9aeee40 Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b am: 3a23af64cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: I61828c73a8b3afc1523b439c50624093610a9f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:56:00 +00:00
Chaohui Wang
ec331ee2d0 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f am: 631c56fc20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: Iddd3130e8f4cf5c5562b968aa9e8d9bbbb0903f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:55:31 +00:00
TreeHugger Robot
cd10b0552e Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Change-Id: I0ec167e7c12e1f3f22811c239644985f863c06ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:54:57 +00:00
TreeHugger Robot
0328978e63 Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Change-Id: I33d6a4c5eb6d99073a5b4f5ce0d86f2647a81c04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:53:58 +00:00
tom hsu
0ce8355c63 [automerge] [Panlingual] Fix the back button press 2p: c0214ff9f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237

Bug: 226894999
Change-Id: I81b99b74f45acdd9f7073aea1d4f5bebd1cd13b1
 2022-04-06 15:37:24 +00:00
tom hsu
c0214ff9f3 [Panlingual] Fix the back button press 
Bug: 226894999
Test: local
Change-Id: I81e6408ebf2587bd023a13dbbdfa97e38efd8c31
 2022-04-06 23:28:17 +08:00
TreeHugger Robot
e0f6939c4c Merge "[Panlingual] Fix settings crash from rotation." into tm-dev 2022-04-06 15:15:37 +00:00
TreeHugger Robot
69204aeff6 Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" 
* changes:
  [automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c 2p: d36ff21fb1
  [automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c
  [Panlingual] Fix settings crash from rotation.
 2022-04-06 15:15:37 +00:00
TreeHugger Robot
8f16b0cd5b Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" into tm-mainline-prod 
* changes:
  [automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c
  [Panlingual] Fix settings crash from rotation.
 2022-04-06 15:15:37 +00:00
Xiaowen Lei
da1f3d6d37 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17543375

Change-Id: I15b857b5bd7688aef3926d2049f2d7d2b0876aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:09:04 +00:00
Xiaowen Lei
15c0ac2279 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 am: 16cbd39800 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17543375

Change-Id: Ia2e146c40554829dcced34fe207c393fd785521e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:08:58 +00:00
TreeHugger Robot
16d918299c Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b am: 9190579a6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: Id16d42adae295f23f1ee54ffcfe0e1b891395e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:08:50 +00:00
TreeHugger Robot
548760d027 Merge changes from topic "presubmit-am-185f63f128a54648a022e31b749710e8" into tm-mainline-prod am: 59d390cded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: I6f90cd3367ac13a928893768e694a24d58508e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:08:25 +00:00
Xiaowen Lei
16cbd39800 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17543375

Change-Id: I629d4fd3dd3a23b0a8c0c6f568f7e70e88a96bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:08:11 +00:00
TreeHugger Robot
9190579a6d Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: I313128fc5febe16ad2fe6b6c92580053b2da9212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:07:57 +00:00
Xiaowen Lei
8708bbd8b3 Merge "Update the function used to log the dream picking events." into tm-dev 2022-04-06 15:04:57 +00:00
TreeHugger Robot
3a23af64cd Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: I83e7923119669ea604bdd72f121d3182bf2dd550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:00:32 +00:00
Chaohui Wang
631c56fc20 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: Ic18c24b08b00ea8a20877fe2d9e9fc2b8e51ad07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:00:17 +00:00
TreeHugger Robot
8554aa1f6c Merge changes from topic "presubmit-am-185f63f128a54648a022e31b749710e8" 
* changes:
  [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2 2p: e6f28fbd49
  [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2
  Fixes 'learn more' link in ScreenTimeoutSettings
 2022-04-06 15:00:11 +00:00
TreeHugger Robot
59d390cded Merge changes from topic "presubmit-am-185f63f128a54648a022e31b749710e8" into tm-mainline-prod 
* changes:
  [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2
  Fixes 'learn more' link in ScreenTimeoutSettings
 2022-04-06 15:00:11 +00:00
TreeHugger Robot
d23aa91e8b Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev 2022-04-06 15:00:11 +00:00
Chaohui Wang
498beaab27 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f am: cc4a5988f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: I2c3539d41a645908c333575bcfa07fcb60cc34db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 14:59:41 +00:00
Chaohui Wang
c92af2b605 Merge changes from topic "presubmit-am-2fdd9a2ee9c448a893b219cbddd5e04a" into tm-mainline-prod am: 2caba70028 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: I453111dade7866a70c02cd9da7175ce112903e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 14:59:34 +00:00
Chaohui Wang
cc4a5988f5 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: I824aad92c5318f1da55e389ce1145321aa9d5837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 14:59:21 +00:00
Chaohui Wang
9c6249a04f Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev 2022-04-06 14:35:51 +00:00
Chaohui Wang
2caba70028 Merge changes from topic "presubmit-am-2fdd9a2ee9c448a893b219cbddd5e04a" into tm-mainline-prod 
* changes:
  [automerge] Fix the flow for ZenCustomRuleSettingsBase 2p: 3b3e66c780
  Fix the flow for ZenCustomRuleSettingsBase
 2022-04-06 14:35:51 +00:00
tom hsu
2473634d72 [Pnalingual] Resolve code conflict. am: 6436a5aa6f am: 715ebf4705 am: 8d2c67bd03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Change-Id: Ic9e8da3d581b12f657576825a81d844808205543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 12:22:36 +00:00
tom hsu
8d2c67bd03 [Pnalingual] Resolve code conflict. am: 6436a5aa6f am: 715ebf4705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Change-Id: I2e252e7b93bc3587fbfeb0e8152fbc16ad6c0f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 12:03:41 +00:00
tom hsu
715ebf4705 [Pnalingual] Resolve code conflict. am: 6436a5aa6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Change-Id: I9e1316234f825ab3cd92fc8e395dbffe82448dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 11:48:43 +00:00
tom hsu
072510b144 [automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c 2p: d36ff21fb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Bug: 228126890
Change-Id: I98aa625c53af24db93a5388e77714e01deeb56bd
 2022-04-06 11:34:07 +00:00
tom hsu
d36ff21fb1 [automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Bug: 228126890
Change-Id: I9d11e77c5cc04810e66f2223f4bb54897f4fed6c
 2022-04-06 11:33:59 +00:00
tom hsu
19bd21d96c [Panlingual] Fix settings crash from rotation. 
- View may not create in time when add view of fragment.

Bug: 228126890
Test: local test.
Change-Id: Idce63dc9d39de09ff1ee684881ea6cb90637ee22
 2022-04-06 19:32:36 +08:00
Presubmit Automerger Backend
58bd2faec6 [automerge] [Pnalingual] Resolve code conflict. 2p: 6436a5aa6f 2p: 9d162016b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Bug: 228292561
Change-Id: I120235e895b8542275a84a314d9cf89ebad088f7
 2022-04-06 11:08:01 +00:00