PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,310 Commits 1 Branch 0 Tags
a62897caa50b93e9397b1fd09c86a49b50836856
Commit Graph

60310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
a62897caa5 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours 
am skip reason: subject contains skip directive

Change-Id: I85c005713515e9397827f38651326f5f63d47f80
 2020-03-17 15:43:25 +00:00
Automerger Merge Worker
47a86f9fe4 Merge "Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932" into rvc-d1-dev-plus-aosp 2020-03-17 15:42:59 +00:00
Automerger Merge Worker
71a49d8c8b Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 
Change-Id: I66efa1d7430a50a3a8f5bf6f04ade55377d2bfaf
 2020-03-17 15:42:53 +00:00
Automerger Merge Worker
75ae98d1be Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932 
Change-Id: Ia679b9dca2a3f98eca1647e276db82ff426c0791
 2020-03-17 15:42:53 +00:00
Automerger Merge Worker
d9dcf5bed2 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours 
am skip reason: subject contains skip directive

Change-Id: I322de6c13adf1a7d3ca194d6b4b9a8d3f6a270d6
 2020-03-17 15:27:08 +00:00
Automerger Merge Worker
b67ed25932 Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 
Change-Id: I7c2992488d3ab3d552a12e207093d1deffee4ded
 2020-03-17 15:26:33 +00:00
Automerger Merge Worker
2779662793 Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 
Change-Id: I5c40a566a91465c230c98be2201d158c945c7103
 2020-03-17 15:26:05 +00:00
Automerger Merge Worker
f9b7313545 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id75d1c9d9ba97160bfa72e8bcdde3a0407856157
 2020-03-17 15:11:40 +00:00
Alex Johnston
e61aaaab51 Merge "Fix strings for certificate installation in Settings" into rvc-dev 2020-03-17 15:07:18 +00:00
Automerger Merge Worker
1f15f102f4 Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: 618ebc3fdf 
Change-Id: Ie00c26d735c95696f5dcaeaed56354adcbe82232
 2020-03-17 13:48:16 +00:00
Automerger Merge Worker
af6b6d2276 Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a 
Change-Id: I3f07c8c044cfccbdfaf2f4b7f0274bff79a611e4
 2020-03-17 13:48:00 +00:00
Automerger Merge Worker
618ebc3fdf Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 
Change-Id: I5914dc21bfa9659fe8ad7abfff027aa10ab5c210
 2020-03-17 13:28:15 +00:00
Automerger Merge Worker
a4ad8f636a Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 
Change-Id: If102804bbb1335393bcd208f32cf66ab9a58e41d
 2020-03-17 13:28:11 +00:00
Automerger Merge Worker
a782ff473d Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: c63489139c 
Change-Id: I85bf952698a5407186fe560b9151ece6825ca348
 2020-03-17 13:15:28 +00:00
Automerger Merge Worker
4f19e358c8 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 
Change-Id: I4fd74c8dba82fb6d92147c6b72bcbbe142704ea1
 2020-03-17 13:15:07 +00:00
Yanting Yang
9204d76c45 Merge "Remove the index of the homepage category tiles" into rvc-dev 2020-03-17 13:11:40 +00:00
Automerger Merge Worker
c63489139c Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 
Change-Id: Ic2788de5e3d7926813d5f36293cef55f67edc131
 2020-03-17 13:03:09 +00:00
Automerger Merge Worker
85b0f5fcd2 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 
Change-Id: I786ed0fefff2d5a81b31b475c154933a5ba5aac5
 2020-03-17 13:03:00 +00:00
TreeHugger Robot
76f4a29510 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev 2020-03-17 12:51:04 +00:00
Automerger Merge Worker
d87561f113 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: c57774521c 
Change-Id: Iaaa8782d661a4aab5fa0c3bf05e9180be57bcafa
 2020-03-17 12:11:00 +00:00
Automerger Merge Worker
f82c724f30 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e 
Change-Id: Ia01fd111005b4806d82f909d05cbd3f6359e61d4
 2020-03-17 12:04:25 +00:00
Automerger Merge Worker
c57774521c Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 
Change-Id: I6b25ea976cbde89633e917491513254163d8418d
 2020-03-17 11:50:00 +00:00
Automerger Merge Worker
05985cb26e Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 
Change-Id: I055e1aa8b1be85d6ba1218642447885fa9b454d9
 2020-03-17 11:49:55 +00:00
TreeHugger Robot
217740d640 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev 2020-03-17 11:32:34 +00:00
Bill Yi
8f23d00553 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I88eb61ab20394d1cf91380f2823a536faaa8619c
 2020-03-17 04:18:33 -07:00
calvinpan
ff11f200c8 Add NR Global to the logic to check if it is Global 
Bug: 151285260
Test: Build pass
Change-Id: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
 2020-03-17 18:27:34 +08:00
Alex Johnston
79e66ffafe Fix strings for certificate installation in Settings 
Certificates privacy page
* Changed 'Your privacy is at risk' to
  'Your data won't be private'.
* Change 'information' to 'data'.
* Changed 'Install anyways' to
  'Install anyways'.

Can't install certificate dialog
* Changed 'Can't install certificates'
  to 'Can't use this file'.

Bug: 151303108
Test: Manual testing
Change-Id: Ia66ff7210ae77204fa2e59f3264f5c799cc47436
 2020-03-17 10:05:28 +00:00
Yanting Yang
298a7fe2e5 Remove the index of the homepage category tiles 
Do not index the tiles of homepage category since we would like to index
their target activity for search.

Fixes: 151418948
Test: visual
Change-Id: I693534de006b4dbcaf192858e6f7d031bad78fef
 2020-03-17 17:55:49 +08:00
SongFerngWang
3d54554521 Fix sim pin lock preference disappear in dual sim. 
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.

Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
 2020-03-17 14:35:31 +08:00
Automerger Merge Worker
708fa8dc80 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: e599f0432e 
Change-Id: I204f5e8e8738f3e1ed1202556d455ed7aa2cfa6f
 2020-03-17 06:11:59 +00:00
Automerger Merge Worker
d4bf77db85 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 
Change-Id: I0a8007c3bfd9dbd61f1856d139a54e97b429fb99
 2020-03-17 06:11:19 +00:00
Automerger Merge Worker
da9185b887 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 
Change-Id: I6807e9d6a88c7a82b5835c773f1216bbe5cd3f24
 2020-03-17 05:58:49 +00:00
Automerger Merge Worker
e599f0432e Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 
Change-Id: Ief773b87a528393024fde3bef29816f6860e07f2
 2020-03-17 05:58:42 +00:00
TreeHugger Robot
1a84719041 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev 2020-03-17 05:43:45 +00:00
Automerger Merge Worker
50130a741b Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: bd59e9ad27 
Change-Id: Iaf734e197a78bc6d513c0cd414d7b174f6d68a7d
 2020-03-17 03:55:48 +00:00
Automerger Merge Worker
dab418626e Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682 
Change-Id: I0819ebac710020ea2df799ada34f9fef48337860
 2020-03-17 03:55:31 +00:00
Automerger Merge Worker
e1c3cdf682 Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 
Change-Id: I7e826cef3b212bcc53cbdc863e6e241fe656429a
 2020-03-17 03:45:49 +00:00
Automerger Merge Worker
bd59e9ad27 Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 
Change-Id: Iada645d9939d5b7343d1ebef27ccba669e9dc268
 2020-03-17 03:45:43 +00:00
tim peng
95cd4c9414 Merge "Output switcher header is not updated with the latest media content" into rvc-dev 2020-03-17 03:26:50 +00:00
Automerger Merge Worker
05f048dde5 Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 371df82782 
Change-Id: I68b21a5b1352674b31ec9b512684856c45142929
 2020-03-17 03:06:23 +00:00
Automerger Merge Worker
e37d169988 Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 0b661e606d 
Change-Id: I124abd0ffb65c56245669d26f3d9400bed89dc4a
 2020-03-17 03:05:36 +00:00
Automerger Merge Worker
371df82782 Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b 
Change-Id: I226fb53261abdeb91e6b8bc77eadc698b1863140
 2020-03-17 02:48:03 +00:00
Automerger Merge Worker
0b661e606d Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b 
Change-Id: Ia0d08c479a2e61f9a35e09c7f3b1bb1f11cac077
 2020-03-17 02:47:57 +00:00
Menghan Li
3f5b95193b Merge "Update R accessibility assets and strings (4/n)" into rvc-dev 2020-03-17 02:28:23 +00:00
Tim Peng
36c4949414 Output switcher header is not updated with the latest media content 
-Register media controller callback
-Update panel header when medadata changes
-Add test cases

Bug: 151396986
Test: make -j50 RunSettingsRoboTests
Change-Id: Id0b8f997899a96c0c94ca6bf099e624a9e87795b
 2020-03-17 09:02:34 +08:00
Automerger Merge Worker
c7908ef1b0 Require attention pref not searchable by default am: 593b5671c8 am: 391d6763fa 
Change-Id: Idcafe099822792c6ae88ffc14a6f6db647c2ea06
 2020-03-17 00:50:50 +00:00
Automerger Merge Worker
d227833dde Require attention pref not searchable by default am: 593b5671c8 am: 441019142c 
Change-Id: I7e5d52e4317a06495ad3c62db4dc7682401d9e03
 2020-03-17 00:50:24 +00:00
Automerger Merge Worker
391d6763fa Require attention pref not searchable by default am: 593b5671c8 
Change-Id: I42a89f083a44b644b95f88ebf0a4ef93036a5ccd
 2020-03-17 00:34:28 +00:00
Automerger Merge Worker
441019142c Require attention pref not searchable by default am: 593b5671c8 
Change-Id: I2f3103877ddca02910682d30deac7cd8bf62f664
 2020-03-17 00:34:21 +00:00
Automerger Merge Worker
781ac2d738 Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017 am: 0fbe648878 am: a7a2a28247 
Change-Id: I8a49a6600aed234c5dc8659ee1e43d5ca9557e38
 2020-03-16 22:56:11 +00:00