PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,731 Commits 1 Branch 0 Tags
a5f08854e36b69bdf38f95b437b33a9c332dc3c2
Commit Graph

72731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
a5f08854e3 [Settings] Inclusive language for Data Usage 
Change wordings in data usage part into inclusive language.

Bug: 160707804
Test: make RunSettingsRoboTests
Change-Id: I713e52df8201413b884257a51bc1f71a0d43179d
 2020-07-15 02:52:32 +00:00
TreeHugger Robot
0d34f6c80b Merge "Import translations. DO NOT MERGE" 2020-07-14 17:08:29 +00:00
Bill Yi
cc67039237 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours am: 697f0fc11d -s ours am: 151541c799 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4f7cff75bf87654b3bdb323f0c9de15143f0f1c
 2020-07-14 16:33:33 +00:00
Bill Yi
f7b0915e1b [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: 0e7fdac130 -s ours am: 7871d50a53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75aebcd1025af49cfd36c7d86b209f3ad8e00b81
 2020-07-14 16:33:27 +00:00
Bill Yi
16c7d140f8 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: f9cf7d32ec -s ours am: cad5554144 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide8c612ccfa5bc5677005563bd2221dd55b381af
 2020-07-14 16:33:21 +00:00
Automerger Merge Worker
f782f2c357 Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours" into rvc-qpr-dev-plus-aosp am: adb5b7c931 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6dc136cce85c1115b2003566984f4274023d3ab2
 2020-07-14 16:33:16 +00:00
Bill Yi
9d194989c3 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 182290e9b8 -s ours am: 78f997a771 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie094c69976f3c5d0cf7d8da8850830558ea247ae
 2020-07-14 16:33:02 +00:00
Bill Yi
151541c799 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours am: 697f0fc11d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaedccbda4b1463dcf0a59747eb806e6b2b78f261
 2020-07-14 16:19:34 +00:00
Bill Yi
7871d50a53 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: 0e7fdac130 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b00968bc0b9079dbd022cc18bd877f6d7646cb8
 2020-07-14 16:19:27 +00:00
Bill Yi
697f0fc11d [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib535f86258804daf779ed6267509978332564780
 2020-07-14 16:19:23 +00:00
Bill Yi
cad5554144 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: f9cf7d32ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0caea5e5332f9bb11208e4eee81d367037dcb79
 2020-07-14 16:19:13 +00:00
Automerger Merge Worker
adb5b7c931 Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours" into rvc-qpr-dev-plus-aosp 2020-07-14 16:19:10 +00:00
Bill Yi
9808f1f5f7 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9138a2e6f5de4811b14fcfe4f94ae7c65423d68b
 2020-07-14 16:19:05 +00:00
Bill Yi
78f997a771 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 182290e9b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee9dd527d25ce6f7e7887ffdae99dd2cd568c6bb
 2020-07-14 16:19:01 +00:00
Bill Yi
f9cf7d32ec [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e7ca6f0d84fd0f4606f76f2aace8e7968710c0b
 2020-07-14 16:05:13 +00:00
Bill Yi
2580a067e1 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic80d575d02bc7a2886b527c3fa4fa8886b68c21f
 2020-07-14 16:05:07 +00:00
Bill Yi
0e7fdac130 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2689b64d28c8959cf3f61d31ebca5bdcb610a6ea
 2020-07-14 16:05:02 +00:00
Bill Yi
d3265e35db [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id91d7e77943acb2d0b08d64615b20da8577ecf83
 2020-07-14 16:04:59 +00:00
Bill Yi
182290e9b8 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If81c15739006a0e476938a21e5739163f07ad565
 2020-07-14 16:04:50 +00:00
Bill Yi
35632cb1c2 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id35fed36fc4331df55138a82a2f4ead80d7c5d4a
 2020-07-14 16:04:49 +00:00
Bill Yi
289d2bf059 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: If55c745f90b6527fc1e0cf1d570ee0e2463b68a6
 2020-07-14 06:25:04 -07:00
Bill Yi
a58e5de4c9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I3d7b397ba8a39c5f6a7ac75e0fa505be39b48775
 2020-07-14 04:13:50 -07:00
Bill Yi
2532f0b32c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I30a4580a86030d499cdaa42ee082af185543ee6d
 2020-07-14 02:03:30 -07:00
TreeHugger Robot
29aad71c6e Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c am: 8870591ab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829

Change-Id: If460eff74cfc509c5e49bf98f1742a1de187805d
 2020-07-14 00:01:36 +00:00
Julia Reynolds
a00e6960ea Update font family am: 1a44a98f34 am: 63a9f32547 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139828

Change-Id: I84e1d696e29a2099ed671e83e4c1f579bfd55bd9
 2020-07-14 00:01:18 +00:00
TreeHugger Robot
8870591ab3 Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829

Change-Id: I3a2a93b4cc2f0e5630f51635cc9313845bb05015
 2020-07-13 23:46:24 +00:00
Julia Reynolds
63a9f32547 Update font family am: 1a44a98f34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139828

Change-Id: I3a4d2eb6abcbf531f94f21c23abe85070f71bd84
 2020-07-13 23:46:10 +00:00
TreeHugger Robot
8fca94f56c Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev 2020-07-13 23:34:13 +00:00
Julia Reynolds
2700b83c48 Restore original importance when unblocking notif channel 
Test: atest
Fixes: 62355992
Change-Id: I5d764d0ade68b2ce5708ae79e9ef488ab57bb141
(cherry picked from commit e2a8266328)
 2020-07-13 20:13:43 +00:00
Julia Reynolds
1a44a98f34 Update font family 
For notification settings, to match the inline settings

Test: manual
Fixes: 153886531
Change-Id: Ie338080bd35a8dc2715330f3b82c272b0be81d54
(cherry picked from commit edb8dd0ec4)
 2020-07-13 20:11:20 +00:00
Automerger Merge Worker
b9035f6bab Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56" into rvc-d1-dev-plus-aosp am: b1a75b7f66 am: b5ec6fafda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I4641201953b949f2c65fbd097971d66a6605d68b
 2020-07-13 17:45:12 +00:00
Automerger Merge Worker
8cbd1da319 Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 am: ffda931026" into rvc-qpr-dev-plus-aosp am: 567afca630 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I9d0068dfb4c2a9d1617eb0ee80e8440463c5b0a5
 2020-07-13 17:44:33 +00:00
Lucas Dupin
01327140f1 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 91ba077612 am: 162d505e14 am: 82c3503d1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I947c54909a719e97562c69664cdd66a30a7207dc
 2020-07-13 17:43:25 +00:00
Automerger Merge Worker
b5ec6fafda Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56" into rvc-d1-dev-plus-aosp am: b1a75b7f66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I541df011c1d6a5a4e9ab2ffa687fd8434d26e691
 2020-07-13 17:27:15 +00:00
Automerger Merge Worker
567afca630 Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 am: ffda931026" into rvc-qpr-dev-plus-aosp 2020-07-13 17:27:04 +00:00
Lucas Dupin
ec9b9a4fd8 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 am: ffda931026 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I64eff205c0e01330ddeacdcc97e0da304dfbb40a
 2020-07-13 17:26:35 +00:00
Lucas Dupin
82c3503d1e Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 91ba077612 am: 162d505e14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I7734d178ac6cbd93a76d258c7edc22434d76ad19
 2020-07-13 17:26:32 +00:00
Automerger Merge Worker
b1a75b7f66 Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56" into rvc-d1-dev-plus-aosp 2020-07-13 17:14:03 +00:00
Lucas Dupin
162d505e14 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 91ba077612 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Iebc0844230afdb44868f4f1a6245808aee291dfb
 2020-07-13 17:13:42 +00:00
Lucas Dupin
ffda931026 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Id71cee5d2db2623b3d66203075d4c34405322bed
 2020-07-13 17:13:39 +00:00
Lucas Dupin
b0f831f3e5 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Iaaeaf39246920eb1abc651247f5cd8b5787b7d2e
 2020-07-13 17:13:32 +00:00
Lucas Dupin
03edb83f56 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I4fc62150f05b1d59bcd77fe7566dd334f1d8931d
 2020-07-13 16:55:39 +00:00
Lucas Dupin
91ba077612 Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Ie6859a17ba1f1d420f231ba6d9385a48ce442923
 2020-07-13 16:55:38 +00:00
Lucas Dupin
9b01b8510a Merge "Delete media feature flag" into rvc-dev 2020-07-13 16:44:15 +00:00
TreeHugger Robot
7024116829 Merge "Fix test case fail" 2020-07-13 03:42:57 +00:00
timhypeng
b5527e329b Fix test case fail 
Bug: 160956047
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib975e906aefc44c59a8465a586832d92664f5147
 2020-07-13 10:29:11 +08:00
TreeHugger Robot
d90229ba2e Merge "Import translations. DO NOT MERGE" 2020-07-11 01:20:50 +00:00
TreeHugger Robot
d673020489 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35 -s ours am: a1bd62eb2e -s ours am: d10325dd23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I04309ba7b4ce75a0f02bd0accb5cee03cf0d2680
 2020-07-10 23:19:31 +00:00
TreeHugger Robot
a7f4f39196 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8539f2ac35 -s ours am: 830ca9712d -s ours am: 2ca966ce1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e6032cf12ff8729f27424fc83c2d81e1581de71
 2020-07-10 23:19:03 +00:00
Bill Yi
f3fa14812c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I40d92298a2a8268cae383b82336b27faa54148aa
 2020-07-10 16:16:00 -07:00