Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,979 Commits 1 Branch 0 Tags
d705c0200beebffe8d9be2a81d7e921e9ef4cd6f
Commit Graph

20152 Commits

Author SHA1 Message Date
Treehugger Robot
f408f0c3f4 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4 am: 99c2ccf984 am: 8d55c46017 am: bc5007dd72 am: 54e4624133 
Change-Id: Id763960ae5081683805d05f8ea47592713f16db8
 2020-04-30 00:00:32 +00:00
Treehugger Robot
54e4624133 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4 am: 99c2ccf984 am: 8d55c46017 am: bc5007dd72 
Change-Id: I2c2994e543a690ff7db70dd0250d49b76e1e1d51
 2020-04-29 23:47:16 +00:00
Treehugger Robot
99c2ccf984 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4 
Change-Id: I77a6c089aec6fe57f79ef7dc7f6630ee8fc68ae7
 2020-04-29 23:01:07 +00:00
Treehugger Robot
d6859736a4 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 
Change-Id: I14dc87ff0f185bdbfb5734b6501f727e2cb19792
 2020-04-29 22:50:24 +00:00
Grace Jia
7098379555 Disable 'Mobile data' selection after removing SIM 
Bug: 153895858
Test: Manually remove SIM and test
Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1
Exempt-From-Owner-Approval: Telephony settings
 2020-04-29 22:34:29 +00:00
TreeHugger Robot
da4c73633a Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9 am: e22a776b12 am: c8b2d09997 am: 968abefdbc 
Change-Id: If01da207c470e3878cfa71a637d1f73e8f987519
 2020-04-29 19:47:54 +00:00
TreeHugger Robot
968abefdbc Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9 am: e22a776b12 am: c8b2d09997 
Change-Id: I77450b815c5f9c1c8f239ea685af1ccde6b1a831
 2020-04-29 19:29:47 +00:00
TreeHugger Robot
4d6ad1dec9 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 
Change-Id: Ia1d018e763df06a1bd9c750f805573a3070e7296
 2020-04-29 18:40:34 +00:00
TreeHugger Robot
7e94c5e3b3 Merge "Fix icon color in dark theme." into rvc-dev 2020-04-29 18:02:45 +00:00
kholoud mohamed
7c84508e16 Fix icon color in dark theme. 
Bug: 154582949
Test: visual testing
Change-Id: Ibb17f06c5b1d9745294af460565aa078c4e2baf2
 2020-04-29 17:43:34 +01:00
Julia Reynolds
f76cee6244 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 68d3972a36 am: c106e6bc03 am: adfd6ba13e 
Change-Id: I60cdb48528604d693889411c9e1efa027bd3a47d
 2020-04-29 16:41:13 +00:00
Julia Reynolds
adfd6ba13e Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 68d3972a36 am: c106e6bc03 
Change-Id: I28f44b8929ad28e241ca9781a4cb9a80549b21e4
 2020-04-29 16:25:50 +00:00
Julia Reynolds
68d3972a36 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 
Change-Id: I14a3372d2ca7304667e3923b94d1a377eb927aa9
 2020-04-29 15:52:56 +00:00
Julia Reynolds
04b6152ef0 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 
Change-Id: Ic77ae688d2b211a1dc3ad5c0b8e2b5967698604e
 2020-04-29 15:42:46 +00:00
Julia Reynolds
c6fe4407fe Merge "Remove unused development setting" into rvc-dev am: e2eb832033 
Change-Id: I834d268678426e9173edacb0c5c9a52fe6941946
 2020-04-29 15:42:45 +00:00
Julia Reynolds
e2eb832033 Merge "Remove unused development setting" into rvc-dev 2020-04-29 15:25:24 +00:00
TreeHugger Robot
64018512ed Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075 am: bc83b982da am: 6faaa7caaf 
Change-Id: I3adf38c9704dae37fa8e78ac75e0ffd466d04462
 2020-04-29 14:30:39 +00:00
TreeHugger Robot
6faaa7caaf Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075 am: bc83b982da 
Change-Id: I57f9070cadb4d8bed271825a66fa1076e836b0d0
 2020-04-29 14:18:07 +00:00
TreeHugger Robot
27c76c3075 Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 
Change-Id: I84b0ddf08b3efa97c7b082c613c18b254471c61d
 2020-04-29 13:38:14 +00:00
TreeHugger Robot
d5cf3b0a5e Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 
Change-Id: Idfd8ff9e9da16191add8c764370e20b5b6ad174f
 2020-04-29 13:22:56 +00:00
TreeHugger Robot
5c6094bcf4 Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 
Change-Id: Ibc3eb51b98ea8dbb864731f92cc5a503d297d857
 2020-04-29 13:22:48 +00:00
TreeHugger Robot
e76cdc27d0 Merge "Fix the preference index conflict problem" into rvc-dev 2020-04-29 13:01:45 +00:00
Sunny Shao
502a5eb1c5 Fix the preference index conflict problem 
Bug: 153888035
Test: manual test
Change-Id: I6c67d2fea752487ceb5fa05c6537df980a0f8d6a
 2020-04-29 11:53:55 +00:00
TreeHugger Robot
aaf55d2ca6 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: a21603a224 am: 6732e446a7 am: 4004667fff 
Change-Id: I58aa44bb4df482ee5e756d175944c0d6bc6ea5ad
 2020-04-29 06:34:01 +00:00
TreeHugger Robot
4004667fff Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: a21603a224 am: 6732e446a7 
Change-Id: I47bf21ce8c231bcd7996e96d9d72e5809d42befd
 2020-04-29 06:20:50 +00:00
TreeHugger Robot
a21603a224 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 
Change-Id: Ie3ba8186a2b0ded3fcfeaf0689c2569aa99c475b
 2020-04-29 05:49:42 +00:00
TreeHugger Robot
8c28127323 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:37:45 +00:00
TreeHugger Robot
b47f88ee05 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 
Change-Id: I5db9bb66a86b1377f43bbf35b4410a44a79d4755
 2020-04-29 05:33:23 +00:00
TreeHugger Robot
222da24344 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 
Change-Id: I8ba500b881798bfe9ee55d5a1d82e3f8926cd4a0
 2020-04-29 05:33:14 +00:00
TreeHugger Robot
fdb8558d88 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:24:29 +00:00
TreeHugger Robot
4c221d1609 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev 2020-04-29 05:17:30 +00:00
Bill Yi
6de079f842 Import translations. DO NOT MERGE 
Change-Id: Ia9288eff67da11149c3207ff4c99093b5b4a2271
Auto-generated-cl: translation import
 2020-04-28 17:26:06 -07:00
Bill Yi
2a3fe1c938 Import translations. DO NOT MERGE 
Change-Id: I110ea7607bf1a03f53ec852eb9fa791f7ad7a2f3
Auto-generated-cl: translation import
 2020-04-28 16:54:21 -07:00
Mady Mellor
3d02a73990 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: e62939420e am: fad77d3ffd am: b09f9f37aa 
Change-Id: I0b631ca3e9a62b083bccf216003386b157206ec3
 2020-04-28 23:25:00 +00:00
Julia Reynolds
6b2716fce0 Remove unused development setting 
Test: atest
Fixes: 151821676
Change-Id: I59338340ac88873d20cd715c82723590af64acd3
 2020-04-28 19:11:47 -04:00
Mady Mellor
b09f9f37aa Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: e62939420e am: fad77d3ffd 
Change-Id: I47ec347fffc1a083e376c6bea445da3d2a9d4fa2
 2020-04-28 23:11:38 +00:00
Kevin Chyn
1895f8b5f2 Move ImeAwareTextEdit to android.widget 
Allows it to be used in more projects

Bug: 154161590

Test: Manually opened each setting that was impacted
Change-Id: Ife59074e5f8ffa76c2c81cca4022ca200bb59526
 2020-04-28 15:57:40 -07:00
Mady Mellor
e62939420e Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 
Change-Id: I9cea0ab8a2d0c1173e8bbd412a08065f9c18794d
 2020-04-28 22:43:11 +00:00
Mady Mellor
ec9e965d90 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e 
Change-Id: I382f080699006d2a3d160290f7b71d84cd65f033
 2020-04-28 22:30:18 +00:00
Mady Mellor
0ffd6c0b17 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e 
Change-Id: Ia002914e6a8c939fdb79ff9a1a918b3869e721d2
 2020-04-28 22:30:08 +00:00
Mady Mellor
2b42301a6e Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev 2020-04-28 22:17:05 +00:00
Julia Reynolds
19d1dc6aa2 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 2581f68bd9 am: 412ddf12e0 am: 98821960c6 
Change-Id: Ib99ff51af1b48dabe90862070f43d4f762558241
 2020-04-28 21:33:28 +00:00
Julia Reynolds
98821960c6 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 2581f68bd9 am: 412ddf12e0 
Change-Id: Ia314e5f53797f07a1d6922558e85ecacbe262924
 2020-04-28 21:20:59 +00:00
Julia Reynolds
2581f68bd9 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d 
Change-Id: Iaf9aaa690e95b62347720d39eb72302d7bf0d4ea
 2020-04-28 20:45:40 +00:00
Julia Reynolds
b97501ff23 Fix some icons on conversation screen am: 1a2e7ad52f 
Change-Id: Iee93e4294fb026c6d62f7bd1cb7bdc37404e9619
 2020-04-28 20:33:48 +00:00
Julia Reynolds
1dae9fac9d Fix some icons on conversation screen am: 1a2e7ad52f 
Change-Id: I51705467345bc8f961a43b4f3b2ecf2fa808cb3e
 2020-04-28 20:33:27 +00:00
Mady Mellor
a27918494f Add list of selected/excluded convos to bubble settings 
* Some changes to extend AppConversationListPrefController
* When a user removes something from the selected or
  excluded list that resets the channel setting

Bug: 148619540
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Change-Id: I7a9ed7b70208dbdefca6c3c09d34d55c65f06408
 2020-04-28 13:18:56 -07:00
Julia Reynolds
1a2e7ad52f Fix some icons on conversation screen 
Test: manual
Fixes: 154930822
Change-Id: Ic480203f494eaccd743a7c77895596174f52539b
 2020-04-28 19:07:08 +00:00
Beverly
d9f5622380 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: 2c3e295e2f am: 7b79d4bb08 am: 5ed8cf12e8 
Change-Id: I0b28770394b45a3e5eaf93249be92968430c3023
 2020-04-28 18:12:07 +00:00
Beverly
5ed8cf12e8 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: 2c3e295e2f am: 7b79d4bb08 
Change-Id: I7e1ef371eaed8840429d468be51adb16c2d0b88a
 2020-04-28 17:58:03 +00:00