PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,881 Commits 1 Branch 0 Tags
ae8fbea47a2c93f80cabd46fbaed48d153bdd34c
Commit Graph

61881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
5ebbcfcffc Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: e735954a98 
Change-Id: I4cc601929f2ed4931ee70620361af01c03fd5da1
 2020-03-17 14:14:30 +00:00
Automerger Merge Worker
4727170883 Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: af6b6d2276 am: 3f8733ddca 
Change-Id: I7c78a425f3f16ef8d18a4720ee250f83d299f3ed
 2020-03-17 14:14:27 +00:00
Automerger Merge Worker
943eafc205 Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: 618ebc3fdf am: 1f15f102f4 
Change-Id: Ifdab74bf168fa0e601c2a06d84349e13940bc7a2
 2020-03-17 14:05:27 +00:00
Automerger Merge Worker
3f8733ddca Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: af6b6d2276 
Change-Id: Id745b84d1ead45bdeb65224e949b678432231168
 2020-03-17 14:05:20 +00:00
Automerger Merge Worker
a5a29e3601 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 3be6478734 am: 9ca7eb9e70 am: 9430e394a9 
Change-Id: I82bdf291e1231487e88a42b78751ad047a83ca8c
 2020-03-17 14:01:13 +00:00
Automerger Merge Worker
95c331715a Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: c63489139c am: a782ff473d am: 042ed76cd9 
Change-Id: Ice4eb87b95a64609891084cdddba60d81f4d178f
 2020-03-17 14:01:06 +00:00
Automerger Merge Worker
9430e394a9 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 3be6478734 am: 9ca7eb9e70 
Change-Id: Ic726a43a5351f978bebea143716c303940f4bdf9
 2020-03-17 14:01:03 +00:00
Automerger Merge Worker
6cdc5bd287 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 4f19e358c8 am: 5826fc7933 
Change-Id: I79d53f43e9d66a24ad025954b023faa94580abd6
 2020-03-17 14:00:52 +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
e735954a98 Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a 
Change-Id: Ib20cbc26491d8b64b8971da3751da666e3878bbd
 2020-03-17 13:48:15 +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
042ed76cd9 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: c63489139c am: a782ff473d 
Change-Id: I6fe2033346739c8063676d7eb7b890d41f4a2389
 2020-03-17 13:35:51 +00:00
Automerger Merge Worker
5826fc7933 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 4f19e358c8 
Change-Id: I6fbaa60443140b003b97785a35698ec44582cdec
 2020-03-17 13:35:39 +00:00
Automerger Merge Worker
9ca7eb9e70 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 3be6478734 
Change-Id: I59b98492af621e8a1e548d334eaa2515a5690dd3
 2020-03-17 13:35:29 +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
3be6478734 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 
Change-Id: I0d4b0f84938382a99d8898902ed290bbb2884b75
 2020-03-17 13:15:17 +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
menghanli
d1adcc61a2 Update R accessibility assets and strings (5/n) 
- Magnification rich content
- Color inversion rich content

Bug: 148837311
Test: Manual test
Change-Id: I4dc52aa00f22cba9cea0c91be3af0b9cb7093182
 2020-03-17 21:12:15 +08: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
237141d5c7 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: 4059a7debf am: 5d722ee5b4 am: 37db5d82d8 
Change-Id: Ie26d12166b1ff7e9adece97ad6ec81d7bb6629a3
 2020-03-17 12:39:47 +00:00
Automerger Merge Worker
37db5d82d8 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: 4059a7debf am: 5d722ee5b4 
Change-Id: Ida02cd3bced4d7ec0c8f906d1279f0e655ebc861
 2020-03-17 12:36:02 +00:00
Automerger Merge Worker
a5b16440c5 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: c57774521c am: d87561f113 am: 5f642ad1bc 
Change-Id: Ie20d365ee1b330795940a514db944c8044058ef0
 2020-03-17 12:35:55 +00:00
Automerger Merge Worker
4c8fb69605 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: f82c724f30 am: 7b83400539 
Change-Id: I33bbe3624d2901d68341a0555a45bbd1b42f9b99
 2020-03-17 12:35:45 +00:00
Automerger Merge Worker
5f642ad1bc Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: c57774521c am: d87561f113 
Change-Id: I31173ba7df8b81dfad14561994cad52ec27c3c66
 2020-03-17 12:21:49 +00:00
Automerger Merge Worker
5d722ee5b4 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: 4059a7debf 
Change-Id: Ie117611ebcf9af3b8eee319ad1ed3297e2339c09
 2020-03-17 12:21:40 +00:00
Automerger Merge Worker
7b83400539 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: f82c724f30 
Change-Id: I19edd29222bc6176ac6f3b5ac3a75f170e78d54b
 2020-03-17 12:21:40 +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
4059a7debf Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e 
Change-Id: I0e6ea23f432c71562274c69e1c203e15cef9ce45
 2020-03-17 12:04:32 +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
Tsung-Mao Fang
d4ba7c1fa7 Ignore broken test cases 
Test: Run robo test
Bug: 151572330
Change-Id: I2e2f0664d6e26827513632772e6b77c9f8b089a7
 2020-03-17 19:09:24 +08: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
govenliu
26b70a9bc7 [Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest 
Remove the @Ignore tag in ConfigureWifiEntryFragmentTest, and add a fake NetworkDetailsTracker to pass test.

Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiEntryFragmentTest
Change-Id: Icf06d27030fa2c68d3c2bee03beb583592beb599
 2020-03-17 18:05:00 +08: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
Automerger Merge Worker
d925b2f811 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 am: b8b7c24bcc am: b152652975 am: 93bb2bb58d 
Change-Id: Ia61f4213d50bd882ad46658da8ea0f8169742879
 2020-03-17 06:50:00 +00:00
Automerger Merge Worker
93bb2bb58d Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 am: b8b7c24bcc am: b152652975 
Change-Id: Ifeacb4ccf071058a528d9bc49ca529a089b37b89
 2020-03-17 06:44:31 +00:00
Automerger Merge Worker
0e0797f719 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: e599f0432e am: 708fa8dc80 am: 404bd786ce 
Change-Id: I3a5e31199618b9da238d150fe78c2323b7bcdb8e
 2020-03-17 06:44:06 +00:00
Automerger Merge Worker
850ec0b38a Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 am: d4bf77db85 am: 5b0b67f6fd 
Change-Id: Ib2cc96a21a81b58cf1606daef9a4da48998e5f95
 2020-03-17 06:43:58 +00: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
404bd786ce Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: e599f0432e am: 708fa8dc80 
Change-Id: I88d89198977f4d413c082a99de4e99d30863fd4e
 2020-03-17 06:32:59 +00:00
Automerger Merge Worker
b152652975 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 am: b8b7c24bcc 
Change-Id: I1ea9e08fbf6eb1f55f46fb031e53eb0de36c77ec
 2020-03-17 06:32:43 +00:00