PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,217 Commits 1 Branch 0 Tags
801f26629f26405a14a3be2492c36748c443cb15
Commit Graph

71217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
b59c43e075 Merge "Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: 14c4b1eaad" into rvc-d1-dev-plus-aosp 2020-06-09 09:38:35 +00:00
TreeHugger Robot
f9724bb1d9 Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: 14c4b1eaad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: I821a03311aa6fc5670117d649c01cb0cac6d9b03
 2020-06-09 09:38:30 +00:00
TreeHugger Robot
713049c75b Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: 4b8c7528f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: Icf6279f2f9ce89fdb27fc944e23ac0572906c5c4
 2020-06-09 09:38:28 +00:00
TreeHugger Robot
eeb568183b Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: 4b8c7528f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: I0e657630c93314f7dd8eb6536c1025ad84ceb904
 2020-06-09 09:38:26 +00:00
TreeHugger Robot
aa860a901a Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: a0c05f2651 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: Ie47ecb201dbc6240af61e7f2e179a7fe1f8bcea1
 2020-06-09 09:38:15 +00:00
TreeHugger Robot
b8724e9ec8 Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: a0c05f2651 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: I5c0d7b3eacd3e3bf314b684d63ecaf545708fec6
 2020-06-09 09:38:14 +00:00
Stanley Wang
36dd53a0db Merge "Update "yes" string for German language." into rvc-dev 2020-06-09 09:35:11 +00:00
Robert Luo
a289708db1 Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity 
Bug: 156696236
Test: 1. Manual 2. make -j42 RunSettingsRoboTests
Change-Id: Icbc5879301fec9a7deacd7ee2896fd41b6feab7a
 2020-06-09 17:26:58 +08:00
TreeHugger Robot
c5cd2de1ed Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: I2fdb86c9ed0e8f75db56bbf727a36a7b6b806f25
 2020-06-09 09:24:56 +00:00
TreeHugger Robot
4b8c7528f3 Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: If0ffa3ba9ba779ad1a91e4b640d2e961d5fa600b
 2020-06-09 09:24:52 +00:00
TreeHugger Robot
14c4b1eaad Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: I33cb6e9dcd4670b3e49edde18b4e630fdd373a93
 2020-06-09 09:24:45 +00:00
TreeHugger Robot
a0c05f2651 Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: Iddab2668f7de47500cd37031389affc2651f5d71
 2020-06-09 09:24:27 +00:00
TreeHugger Robot
debe9b3577 Merge "Add extra summary string in cross profiles page" into rvc-dev 2020-06-09 09:16:51 +00:00
TreeHugger Robot
c628df6914 Merge "Add new description to Permission manager in settings" into rvc-dev 2020-06-09 09:10:20 +00:00
TreeHugger Robot
53e2c40167 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 579189a06b am: 160fedb6a8 am: bc18278871 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I47efaf20e429e5d2600d7d6176f6b89bd9190b68
 2020-06-09 07:13:24 +00:00
TreeHugger Robot
5cbaae540c Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 7014feb9a7 am: e7770d0bbb am: 52537a98a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I62de6b2459e05b57c03b5d50a04f4c04327a731c
 2020-06-09 07:11:48 +00:00
TreeHugger Robot
bc18278871 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 579189a06b am: 160fedb6a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I6375843ee5e5dd60e86478ec5c5be057dc0f8560
 2020-06-09 07:09:56 +00:00
TreeHugger Robot
52537a98a7 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 7014feb9a7 am: e7770d0bbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I4e576483a84f02c36c658a56d9bf17285c440ce5
 2020-06-09 06:59:41 +00:00
TreeHugger Robot
160fedb6a8 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 579189a06b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: Ibe7f26fbb2ae26132ff6ab1d84fc23852cd35c36
 2020-06-09 06:58:33 +00:00
Tim Peng
2b4f45574e Apply RangeBuilder amination for media transferring 
-Replace transferring string with animation
-Set RANGE_MODE_INDETERMINATE mode when transferring
-Add padding parameter for indeterminate progress bar

Bug: 153615031
Test: make -j42 RunSettingsRoboTests
Change-Id: I11c99aaf0c9d585dc834b06919f062d44eefbf65
 2020-06-09 06:48:07 +00:00
TreeHugger Robot
1b0b78387c Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 7014feb9a7 am: b93b108379 am: 47cc72d326 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: If57f06fbc728762d316659f5287582e0c1f98430
 2020-06-09 06:47:25 +00:00
TreeHugger Robot
47cc72d326 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 7014feb9a7 am: b93b108379 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I491eb2d18d3d5e905f5b946e8f3575fb78cf4b2a
 2020-06-09 06:47:08 +00:00
TreeHugger Robot
b93b108379 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 7014feb9a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I6baba679ff67c34587aa1efa15d7620e13734445
 2020-06-09 06:44:30 +00:00
TreeHugger Robot
579189a06b Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: Ia81192a3c3557bf5b39f050b2037af51f5c7e78e
 2020-06-09 06:44:16 +00:00
TreeHugger Robot
e7770d0bbb Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 7014feb9a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I3cce0bee52484922bba9198ecffbed08dbe53a29
 2020-06-09 06:44:13 +00:00
TreeHugger Robot
7014feb9a7 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: Id8ad9c5edcb475c26e3474af7c53ce1422d68291
 2020-06-09 06:43:30 +00:00
TreeHugger Robot
eef7b5e7e3 Merge "Add blob size to shared data dev options screens." into rvc-dev 2020-06-09 06:36:21 +00:00
TreeHugger Robot
bc1be06fe1 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: 825fa93316 am: 62746f0d84 am: 1e89d84c06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I0a46f922306ff837a17371e75257787d111b4794
 2020-06-08 22:53:31 +00:00
Automerger Merge Worker
9559196cc1 Merge "Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 72f55ee81c" into rvc-qpr-dev-plus-aosp am: 4097433543 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Ic9803d8451cb8a83deb72910ccde9541259b67d3
 2020-06-08 22:53:23 +00:00
TreeHugger Robot
fa00c26f50 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 0a93295af2 am: 84a644b0e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I93976166e73eace442aa4f4323021e3ecb20e275
 2020-06-08 22:53:08 +00:00
TreeHugger Robot
1e89d84c06 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: 825fa93316 am: 62746f0d84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Ic01983978c42ab3a67e2d1ae114832ba233e95f9
 2020-06-08 22:38:46 +00:00
Automerger Merge Worker
4097433543 Merge "Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 72f55ee81c" into rvc-qpr-dev-plus-aosp 2020-06-08 22:38:40 +00:00
TreeHugger Robot
93c1c50adb Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 72f55ee81c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I5347ac8b0cba757b8a239dea23e3b28f45c9cc0e
 2020-06-08 22:38:33 +00:00
TreeHugger Robot
84a644b0e4 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 0a93295af2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I48b2d735d76f29428842d5659e89516ebf32a891
 2020-06-08 22:38:30 +00:00
TreeHugger Robot
62746f0d84 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: 825fa93316 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Icad25036f76c947dcc84fdede3a8be1a4afbc5fd
 2020-06-08 22:26:38 +00:00
TreeHugger Robot
0a93295af2 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Ia18605f157581a2c1baf9d2fabac9f8f0631243e
 2020-06-08 22:26:28 +00:00
TreeHugger Robot
72f55ee81c Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Id47b6b24ae7930b3b3f22c481ec51a008d59b818
 2020-06-08 22:26:28 +00:00
TreeHugger Robot
825fa93316 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I811bbe7d8b1ab864f8af45a60b8e1a919dc08013
 2020-06-08 22:15:47 +00:00
TreeHugger Robot
cc2652c5e9 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I9e00ad9c654ce922cd3d10803eabc71b0b6f37c1
 2020-06-08 22:15:36 +00:00
TreeHugger Robot
01464a1bff Merge "Fix shortcut flags" into rvc-dev 2020-06-08 22:06:20 +00:00
Nate Myren
a1933458c5 Add new description to Permission manager in settings 
Fixes: 158125093
Test: Navigate to "Permission manager" in settings (both in privacy, and
in apps & notifications), and verify the summary says "control app
access to your data".

Change-Id: I43f7f38dde119bad96ec9d30a43129e7cacf752a
 2020-06-08 13:43:47 -07:00
Julia Reynolds
6534317317 Fix shortcut flags 
Test: view the conversation detail page for a conversation
with a posted notification
Fixes: 158033229

Change-Id: I3c51d9565201cb39a5d76d8aaca75c026e630e51
 2020-06-08 16:11:23 -04:00
Treehugger Robot
6dd840715f Merge "Settings performance testing" am: cd85c64362 am: d6d12e558c am: 9a354eac3c am: bf6d85215a am: 73a13afce3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1318235

Change-Id: I03a1f129fad91cfdec9ec57212c061bd03298412
 2020-06-08 17:31:32 +00:00
Xin Li
2aed784563 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours am: 71f9ff258a -s ours am: 0bf4f27123 -s ours am: 478b4df6b2 -s ours am: 8b37ae8d14 -s ours 
am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: I98f3e0700f3ba4e7ac3770e631e7811817af1181
 2020-06-08 17:25:06 +00:00
Treehugger Robot
73a13afce3 Merge "Settings performance testing" am: cd85c64362 am: d6d12e558c am: 9a354eac3c am: bf6d85215a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1318235

Change-Id: I563bd0f5603e47d77928a6c7d31ee0c8ad69b30b
 2020-06-08 17:02:30 +00:00
Xin Li
8b37ae8d14 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours am: 71f9ff258a -s ours am: 0bf4f27123 -s ours am: 478b4df6b2 -s ours 
am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: If41ba232497c0aaf7fbe5496b09ba7b4a4905e15
 2020-06-08 16:42:02 +00:00
Treehugger Robot
bf6d85215a Merge "Settings performance testing" am: cd85c64362 am: d6d12e558c am: 9a354eac3c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1318235

Change-Id: I98a7840f33d8d217ad2d82bd434c8850d8e40ce9
 2020-06-08 16:34:53 +00:00
Xin Li
478b4df6b2 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours am: 71f9ff258a -s ours am: 0bf4f27123 -s ours 
am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: Ia6ce3e6ce68c37c0cbcf0d31aa44c43e59cc4fd7
 2020-06-08 16:29:19 +00:00
Treehugger Robot
9a354eac3c Merge "Settings performance testing" am: cd85c64362 am: d6d12e558c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1318235

Change-Id: I599a60ac2cb6bf475017ef66252df2e9c960829b
 2020-06-08 16:19:32 +00:00
Xin Li
0bf4f27123 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours am: 71f9ff258a -s ours 
am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: I63768f19313ecdc5ce64eb4a169612b5b55e91a7
 2020-06-08 16:08:00 +00:00