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

59803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Lee Chou
ee81a02109 Require authorization before turning off eSIM security feature 
eSIM has a feature that requires an auth check before deletion, this
adds a security check before allowing the security feature to be turned
off.

TogglePreferenceController was changed to BasePreferenceController to
separate updating the state from UI press and updating from code.

Bug: 150568010
Test: mp settingsg and manual testing
Change-Id: I9e74e173720dce7b25d2d8a1e9004862cdb5e2e0
 2020-03-02 05:23:49 +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
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
tim peng
d09ecc3e96 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev 2020-03-02 01:25:09 +00:00
Jaewan Kim
9f9ac53fe6 Fix MediaSession.Token#equals() 
This also fixes the Activity#setMediaController() which previously
ignored because the MediaSessionService failed to find session set to
the foreground activity.

Bug: 149006225
Test: Run MediaActivityTest in CtsMediaTestCases
Change-Id: I18d3097f7b20275a20b1de789be6884f843668ae
 2020-03-02 02:46:44 +09:00
Automerger Merge Worker
4f211b3faa Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: bd7f968a1c 
Change-Id: I42faf67d50e8a6ba35e7f8fa7202b08845b69063
 2020-03-01 05:04:00 +00:00
Automerger Merge Worker
d543081a23 Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: 2534b7ddf8 
Change-Id: I2b335e3ce004f77b9b2670d63c856a016e4e8c2d
 2020-03-01 05:03:49 +00:00
Automerger Merge Worker
bd7f968a1c Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff 
Change-Id: Iabc6caa61f028cb2a2f5b36a595cc1e6da6c8ec8
 2020-03-01 04:53:23 +00:00
Automerger Merge Worker
2534b7ddf8 Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff 
Change-Id: I8ddf41253e9e5b1b2acd3793d1671b18e6074a0f
 2020-03-01 04:53:09 +00:00
TreeHugger Robot
f302ee2aff Merge "Only show graphics driver option when the apk is available." into rvc-dev 2020-03-01 04:42:02 +00:00
Automerger Merge Worker
309ef55124 Merge "Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: 88416ffaf6" into rvc-d1-dev-plus-aosp 2020-03-01 03:47:20 +00:00
Automerger Merge Worker
d9a9b26030 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: 88416ffaf6 
Change-Id: I1069a7a2e62c78b98c50f9e6b8eda5dca301b635
 2020-03-01 03:47:12 +00:00
Automerger Merge Worker
0c31cb3f6d Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: c3ab634078 
Change-Id: Ic82d692d4cd8ba491d04e1857705f990e512adc5
 2020-03-01 03:47:08 +00:00
Automerger Merge Worker
88416ffaf6 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 
Change-Id: Ie864fbbc9631721b9f9fe4259cb13651dd135926
 2020-03-01 03:34:25 +00:00
Automerger Merge Worker
c3ab634078 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 
Change-Id: Ic92989a2d2a096c06d59039b6359e869855edf84
 2020-03-01 03:34:09 +00:00
tim peng
3248376473 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev 2020-03-01 03:22:29 +00:00
Bonian Chen
1b8174689d [Settings] Remove unused string for erease eSIM 
Remove strings added by ag/6804404 which are no longer required by b/132114333.

Bug: 133790033
Test: build pass
Change-Id: I3ce375efd04164cf93cff2c89436e222df14bfeb
 2020-03-01 01:19:44 +00:00
Bonian Chen
2de00e766d [Settings] NullPointerException when disable eSIM/Fi 
When disabling eSIM/Fi, CarrierConfig retrieved on that subscription
becomes null and need to perform null pointer checking when accessing
it.

Bug: 149484288
Test: manual
Change-Id: If8a206788407a65c2cb9e5bafe3bc89b93cf63fe
 2020-03-01 01:15:06 +00:00
Automerger Merge Worker
9a3a819ec5 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 91f7309d5d 
Change-Id: I07df3083ac3d41892219c3aedfdc361ecff4be0b
 2020-02-29 05:52:31 +00:00