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

59799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
db7e504c39 [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: fec1d3f158 -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history

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

Change-Id: If8f75b81c1cedeeb37cadf736cdbaa20cbc57fea
 2020-03-03 10:29:59 +00:00
Automerger Merge Worker
4c3e56c6ce [automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 2149d18fb1 am: 3a82fc91d9 -s ours 
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 56e8278498 is in history

Change-Id: I45dcf389f982ccf1ae1490ea5e3f38d8d7249aaa
 2020-03-03 10:27:35 +00:00
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
143d6660b3 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 am: 44f714fa57 am: 80179c48fd 
Change-Id: Iec3284862f269e873e506cf2f54f50b6d6906c85
 2020-03-02 19:26:00 +00:00
Automerger Merge Worker
2ec712b0f8 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: a8a09591c2 am: 0738bcd7bb am: a8fc740a68 
Change-Id: I3670ccb3f84ca6a44016161bf269e936a49f5b60
 2020-03-02 19:23:53 +00:00
Automerger Merge Worker
a68ee602fb Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 am: 6757a04c18 am: 185fa23d45 
Change-Id: I0f65598bef92ab99f76b7cadccf10da18b6a7557
 2020-03-02 19:19:52 +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
Rahul Sabnis
c3684ebd22 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" 2020-03-02 18:43:47 +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
6379af29ba 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 am: 10a9293134 
Change-Id: I5962cd48beba16fb0f4a08839a4e24f19e8d29df
 2020-03-02 14:44:11 +00:00
Automerger Merge Worker
568cc9e640 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 am: 4927d9d7f3 
Change-Id: Ic1d4a0ef0d96cec9d193dd1d989dbf7819bd894b
 2020-03-02 14:44:03 +00:00
Automerger Merge Worker
8bb5205146 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: 95a522b46f am: cdfc2b1f4d 
Change-Id: Ia5826850ac3f665d9888aa2beabedbb63ac203aa
 2020-03-02 14:43:54 +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
e77673594d Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d am: 9b798aa738 am: 2b481a5969 
Change-Id: Ic082a4f9aa65114eec606edb77c3c7bb8e2be8e8
 2020-03-02 12:35:57 +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
b4909b5f21 Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 8023599c8d am: 20f76a8e72 
Change-Id: I9762058e95c97b20ba6cb4955998b81e7fc011cb
 2020-03-02 10:44:49 +00:00
Automerger Merge Worker
3cf34d6fcc Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 am: ea0ff4fe06 am: 29d518f316 
Change-Id: I03849fd21d845881c2e8c4529b81835c3a15c0af
 2020-03-02 10:44:30 +00:00
Automerger Merge Worker
b272edb4a1 Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a am: 454dbfd402 am: 1104b5e6b9 am: 33ae9e0ed1 
Change-Id: If9bae6eb1c9f924a63d41f7310f0377c4681ce41
 2020-03-02 10:44:17 +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