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

59665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Automerger Merge Worker
5962711f8f Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb 
Change-Id: I5c7a85ba47eb9f069341946957cedbcf084457f0
 2020-03-02 10:13:13 +00:00
Automerger Merge Worker
3248e62e0d Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb 
Change-Id: I339fc21bfa9ecf76e5f0088127bad900df3bb76f
 2020-03-02 10:12:45 +00:00
Automerger Merge Worker
572b728a87 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d 
Change-Id: I12e169a2271b1c9f10b258bf720f23eeeaf968d4
 2020-03-02 10:12:02 +00:00
Automerger Merge Worker
143575e128 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d 
Change-Id: Ic4fd81e813044d707d1e3067ed6047c03a67b98c
 2020-03-02 10:11:55 +00:00
Automerger Merge Worker
7cda6b423a Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 
Change-Id: I4f5a29975aed084e1080387d6eb4500121c23ee0
 2020-03-02 10:11:44 +00:00
Treehugger Robot
c6603dfda8 Merge "Fix for User edit info dialog during rotation" 2020-03-02 07:45:36 +00:00
TreeHugger Robot
985b1e8ffb Merge "Fix the button display problem in Dark theme page" into rvc-dev 2020-03-02 07:42:19 +00:00
Jaewan Kim
18e16e416d Merge "Fix MediaSession.Token#equals()" into rvc-dev 2020-03-02 06:28:20 +00:00
Automerger Merge Worker
6ee2833a49 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 am: 06f1bd646e 
Change-Id: I0b432e548a0f5c52abd0cd7d31bbf59b9d4d32ec
 2020-03-02 05:27:52 +00:00
Automerger Merge Worker
26426c8d14 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 4e9ab8a65b am: f3226a5b25 
Change-Id: I139a2f99b815e775abdc8197ec833b8bb9ad0f51
 2020-03-02 05:27:43 +00:00
Automerger Merge Worker
0dc3ce9d55 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 am: afdfab09f5 
Change-Id: I8228558e467f00779d62197335e11ac738e60c5d
 2020-03-02 05:27:37 +00:00
Automerger Merge Worker
06f1bd646e Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 
Change-Id: Ib4d88f6b283090b68c26bec80c41d83fb311a669
 2020-03-02 05:14:52 +00:00
Automerger Merge Worker
f3226a5b25 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 4e9ab8a65b 
Change-Id: Id0edd2b8f72503b92a04fe68135b61012120e42e
 2020-03-02 05:14:52 +00:00
Automerger Merge Worker
afdfab09f5 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36 
Change-Id: I3f032e01f758caf48a711e432343783cf697af05
 2020-03-02 05:14:41 +00:00
Automerger Merge Worker
4e9ab8a65b Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 
Change-Id: Id3af44eb9beea5a612e69c25fda4dd26fa22e5c6
 2020-03-02 05:04:50 +00:00
Automerger Merge Worker
3ea368bc36 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 
Change-Id: I5ca697af3382e26d3d5e981e972aba269cdad131
 2020-03-02 05:04:44 +00:00
Bonian Chen
1f0c0b18e4 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev 2020-03-02 04:51:05 +00:00
Sunny Shao
1de4c009ea Fix the button display problem in Dark theme page 
- Dark theme is disabled when Battery save is on.
- Let dark theme page not be searchable when Battery save is on.

Fixes: 150443799
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display.darkmode
Change-Id: I2674499dd64333825765f70ed1f31dcb83e1b895
 2020-03-02 11:59:28 +08:00
Automerger Merge Worker
2e436079e9 Merge "Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d" into rvc-d1-dev-plus-aosp am: 7dc09bd0ed 
Change-Id: I3756b4b309fd91a8612bb6e247c50094d2319094
 2020-03-02 02:05:33 +00:00
Automerger Merge Worker
17dbaebd6c Merge "Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f am: 1761fa1911" into rvc-qpr-dev-plus-aosp 2020-03-02 02:05:27 +00:00
Automerger Merge Worker
134b177e46 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f am: 1761fa1911 
Change-Id: I586d911d8b89f25d2fab2f70f171ae45a9ebba13
 2020-03-02 02:05:22 +00:00
Automerger Merge Worker
401c586bc5 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f am: 9845b9f08d 
Change-Id: I5945c988305e15fb6ed16387fe354f79b7102416
 2020-03-02 02:05:11 +00:00
Automerger Merge Worker
1761fa1911 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f 
Change-Id: I9e7c4fe582c9b6336610b87b4c7b70d9e84e3a71
 2020-03-02 01:49:44 +00:00
Automerger Merge Worker
7dc09bd0ed Merge "Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d" into rvc-d1-dev-plus-aosp 2020-03-02 01:49:41 +00:00
Automerger Merge Worker
9845b9f08d Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f 
Change-Id: I739b9860174ae08584b0d4c941a9d2976653ec56
 2020-03-02 01:49:37 +00:00
Automerger Merge Worker
275f21d3e7 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d 
Change-Id: Ic23a9891a8f667e48c41b0f188a25d5afd4a396e
 2020-03-02 01:49:37 +00:00
Automerger Merge Worker
2563b5f61d Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 
Change-Id: Ifd4be196c59b940bc4888effce73aaf28e50afb8
 2020-03-02 01:39:04 +00:00
Automerger Merge Worker
6b0088679f Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 
Change-Id: I3cccfeaa5e5e5b1e448764a50e503ba02e094f27
 2020-03-02 01:38:51 +00:00