PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,643 Commits 1 Branch 0 Tags
fec1d3f158393da14d4facbbdb0d85a1a45fe050
Commit Graph

59643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
fec1d3f158 [automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: 4c435922e5 -s ours am: a43cd13dad -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history

Change-Id: I5002bf7518dcee2ec32066818ecac1bd3d68c7b4
 2020-03-03 10:18:30 +00:00
Automerger Merge Worker
8ad6d65c0a [automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 79741be4bc -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history

Change-Id: Iec929aaea43c5a24cc4a310de03d34f3fd7a9ae9
 2020-03-03 10:17:47 +00:00
Automerger Merge Worker
3a82fc91d9 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 2149d18fb1 
Change-Id: I939122590d84a1b95a7c7247e289d14bb4a935a1
 2020-03-03 10:17:08 +00:00
Automerger Merge Worker
a43cd13dad [automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: 4c435922e5 -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history

Change-Id: Ibb84fd8864ff09ccc924039f4c6a3d8c7028d4f8
 2020-03-03 10:04:14 +00:00
Automerger Merge Worker
79741be4bc Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a 
Change-Id: If3cfa6a75e1db2b7685385f60a7b3a0287a2836b
 2020-03-03 10:03:02 +00:00
Automerger Merge Worker
2149d18fb1 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a 
Change-Id: I110603e8a64b7dea0bf49728f7fb3df460598207
 2020-03-03 10:02:56 +00:00
Automerger Merge Worker
4c435922e5 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d 
Change-Id: I5145177f1e9c982af790b0f7aa95ceaf84161c39
 2020-03-03 09:52:20 +00:00
Automerger Merge Worker
b5191ad96a Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d 
Change-Id: I6d12c929d4fd1c763b6a49d4cfe7b82da5075e5d
 2020-03-03 09:52:01 +00:00
Alex Johnston
cf470fab9d Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev 2020-03-03 09:39:28 +00:00
Automerger Merge Worker
80179c48fd Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 am: 44f714fa57 
Change-Id: Icdf6f72f18b42c009e44faa7f8309dee9b6853b6
 2020-03-02 19:07:14 +00:00
Automerger Merge Worker
a8fc740a68 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: a8a09591c2 am: 0738bcd7bb 
Change-Id: I87651e45a1c78d06c181bd1077c4a9f71ffb4737
 2020-03-02 19:04:42 +00:00
Automerger Merge Worker
185fa23d45 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 am: 6757a04c18 
Change-Id: I0ae6120f94718f90efb5e48ab1ffd77ddc56d327
 2020-03-02 18:56:13 +00:00
Automerger Merge Worker
44f714fa57 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 
Change-Id: I16bff6aaee6ba65327ac66b551998059e792b31e
 2020-03-02 18:45:01 +00:00
Automerger Merge Worker
6757a04c18 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 
Change-Id: Ifed88b1a48216086db69e47922ec43d565077324
 2020-03-02 18:44:44 +00:00
Automerger Merge Worker
0738bcd7bb Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: a8a09591c2 
Change-Id: I27b634409bf6bebcbdb9cce850b6bca74790b922
 2020-03-02 18:41:57 +00:00
Automerger Merge Worker
f8139ef988 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b 
Change-Id: Id1ca1fe5b1949e68006c6c4fe7c0f2c9c4a888fb
 2020-03-02 18:41:16 +00:00
Automerger Merge Worker
a8a09591c2 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b 
Change-Id: Idd1c67a5e20a373ea23c3b414236171692f6b64e
 2020-03-02 18:41:15 +00:00
Sarah Chin
4d59bce21b Merge "Rename calls to isGlobalModeEnabled" into rvc-dev 2020-03-02 18:11:23 +00:00
Automerger Merge Worker
10a9293134 Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: a98440f340" into rvc-qpr-dev-plus-aosp 2020-03-02 14:32:53 +00:00
Automerger Merge Worker
31469683f6 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: a98440f340 
Change-Id: I8f0bf84d3aa12338a4297a4c79e44dfe8aaaf282
 2020-03-02 14:32:49 +00:00
Automerger Merge Worker
4927d9d7f3 Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2" into rvc-d1-dev-plus-aosp am: 1b5264cf5f 
Change-Id: Iaa521b0d0b0679ab227cfa5685565eb68a298898
 2020-03-02 14:32:45 +00:00
Automerger Merge Worker
cdfc2b1f4d Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: 95a522b46f 
Change-Id: I2200fd8516a4f8166d28fc29ca3ccb9565c4132e
 2020-03-02 14:32:35 +00:00
Automerger Merge Worker
1b5264cf5f Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2" into rvc-d1-dev-plus-aosp 2020-03-02 14:21:12 +00:00
Automerger Merge Worker
a98440f340 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c 
Change-Id: I4c3acec257871bf056d42fdb7adccd59472a9688
 2020-03-02 14:21:08 +00:00
Automerger Merge Worker
a13d2069e0 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2 
Change-Id: I90ff92c278d433650c47e41893073237c3cac263
 2020-03-02 14:21:05 +00:00
Automerger Merge Worker
95a522b46f Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c 
Change-Id: Id3ecdebf02151d7c46b6bf5e2e3ded924881bb26
 2020-03-02 14:20:58 +00:00
Automerger Merge Worker
8de6fc23f2 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 
Change-Id: Idddc73ccfd806168f29b7bb30459686740cd7b60
 2020-03-02 14:08:35 +00:00
Automerger Merge Worker
300909e22c Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 
Change-Id: I36d2ba74ca0e28c8bc696ca2a9d09f59f045f3f8
 2020-03-02 14:08:33 +00:00
TreeHugger Robot
4a76598ba5 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev 2020-03-02 13:56:51 +00:00
Automerger Merge Worker
2b481a5969 Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d am: 9b798aa738 
Change-Id: Ib814aa115d5fe159726ef676092b88a681d6c45a
 2020-03-02 12:26:47 +00:00
Automerger Merge Worker
9b798aa738 Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d 
Change-Id: I9b7146a9409ead2395d9abee3aba3416158639a6
 2020-03-02 12:07:12 +00:00
Alex Johnston
051c3ecaa3 Add policy transparency dialog to 'Remove work profile' 
* In New COPE mode, no explanation was being shown to the
  user as to why the work profile cannot be removed.
* This CL adds a policy transparency dialog when the
  'Remove work profile' preference is selected.
* This was done by modifying AccountRestrictionHelper to
  set the preference to disabled by admin if the device is
  in New COPE mode and the base restriction
  DISALLOW_REMOVE_MANAGED_PROFILE is enforced.

Bug: 149391073
Test: Manual testing
Change-Id: Iec0f57b988e1d4fd08bca040abd1bb30b6991507
Merged-In: Iec0f57b988e1d4fd08bca040abd1bb30b6991507
(cherry picked from commit 56e8278498)
 2020-03-02 12:05:22 +00:00
Automerger Merge Worker
6ad23a342d Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d 
Change-Id: I710a54c16476313e83bf8ee9c12c0712a184c65c
 2020-03-02 11:52:50 +00:00
Automerger Merge Worker
98e3ed4e5d Merge "Fix NPE in PanelFragment" am: 06cafcd733 
Change-Id: Ia08ab086c610de141b4cadd2ae097b596351e46e
 2020-03-02 11:37:36 +00:00
Treehugger Robot
06cafcd733 Merge "Fix NPE in PanelFragment" 2020-03-02 11:21:05 +00:00
Automerger Merge Worker
20f76a8e72 Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 8023599c8d 
Change-Id: I268680230559b0b936839ba6e902c08dbf63d7d4
 2020-03-02 10:43:53 +00:00
Automerger Merge Worker
29d518f316 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 am: ea0ff4fe06 
Change-Id: Ide561c44f6490c5d76a330d86387a59e0021cdeb
 2020-03-02 10:42:13 +00:00
Automerger Merge Worker
33ae9e0ed1 Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a am: 454dbfd402 am: 1104b5e6b9 
Change-Id: Ie43b9b77791ccd51af73df9b396938512e4933a8
 2020-03-02 10:42:01 +00:00
Automerger Merge Worker
1104b5e6b9 Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a am: 454dbfd402 
Change-Id: Ib10b10fe8b1199c07bb780fec12be9fa74566e60
 2020-03-02 10:33:48 +00:00
Automerger Merge Worker
eb6d6edadb Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 26953558d9 
Change-Id: I796caa927be4dd29dbb663201fef66a3ed462c19
 2020-03-02 10:33:30 +00:00
Automerger Merge Worker
ef73a232b4 Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 3248e62e0d am: 86513a62cb 
Change-Id: I2b948ab21a65058a8e3c5fa042d44bfa0ee1c9e0
 2020-03-02 10:33:13 +00:00
Automerger Merge Worker
26953558d9 Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f 
Change-Id: I622b1f56afd574bf3d280299da9cd3c253798c2a
 2020-03-02 10:28:39 +00:00
Automerger Merge Worker
454dbfd402 Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a 
Change-Id: Ia6a3ca26dd3b2fdfce8df0cb21b24927fcb07bcb
 2020-03-02 10:27:50 +00:00
Automerger Merge Worker
86513a62cb Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 3248e62e0d 
Change-Id: I2ad0df1265c331a9bde63e8db069395f11a42b1e
 2020-03-02 10:27:17 +00:00
Automerger Merge Worker
8e0e86cfb3 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 am: 315fb9d172 
Change-Id: I16b7c483b8266f2aeb28609be48a69055f7b5299
 2020-03-02 10:27:05 +00:00
Automerger Merge Worker
8023599c8d Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f 
Change-Id: Ie0c432a3f5fa44812f90cd21278d4861dadedc0d
 2020-03-02 10:26:57 +00:00
Automerger Merge Worker
ea0ff4fe06 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 
Change-Id: I7b1cb006ec1cad2e5a1e5a315eab8cfe37199827
 2020-03-02 10:26:41 +00:00
Automerger Merge Worker
48f99cf65b Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 572b728a87 am: ae4e86c4db 
Change-Id: I150aec8290c1e0681b996dc92b38b9169742caad
 2020-03-02 10:26:39 +00:00
Automerger Merge Worker
315fb9d172 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 
Change-Id: Iee2a8a55feea913e0e76bb9057bbcd89fc35e892
 2020-03-02 10:26:24 +00:00
Automerger Merge Worker
ae4e86c4db Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 572b728a87 
Change-Id: Iec0bc80c3f2bb4a974a394b5cf4dc2ecfadc918f
 2020-03-02 10:21:18 +00:00