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

59328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
68eb90cda8 [automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours 
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12 is in history

Change-Id: I23fc0161148e4c7f30b017a41fd04749f7d239d3
 2020-03-03 10:49:36 +00:00
Automerger Merge Worker
c1ee210aef [automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours 
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a is in history

Change-Id: I1e9547363f67b8bb1b79cb25961054b7efc5c4fa
 2020-03-03 10:49:35 +00:00
Automerger Merge Worker
42b698cdc5 Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 
Change-Id: I237ff4ef41d3dfb3fd74f74e0c252898d19962e5
 2020-03-03 10:27:48 +00:00
Automerger Merge Worker
c405329ce7 Remove reference to PhoneConstant. am: 28c11a8c01 
Change-Id: I635f49570f67f88cca0f937bb3aac3361f9a926a
 2020-03-03 10:27:47 +00:00
Treehugger Robot
1ea70d24d5 Merge changes I193805ef,I2e1b9ac5 
* changes:
  [Settings] Replace isImsRegistered
  Remove reference to PhoneConstant.
 2020-03-03 10:15:27 +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
Alex Johnston
cf470fab9d Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev 2020-03-03 09:39:28 +00:00
Bonian Chen
a0b4ca3684 [Settings] Replace isImsRegistered 
Replace isImsReigstered() by callback from ImsMmTelManager.

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: I904da749df7074918d205ebd004a173ed109c561
Change-Id: I193805ef947636e50bb21d273be15361378d8f8a
 2020-03-03 15:11:27 +08:00
tom hsu
28c11a8c01 Remove reference to PhoneConstant. 
Create static constant in SimStatusDialogController.

Test: make
Test: m RunSettingsRoboTests
Change-Id: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
Merged-In: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
 2020-03-03 15:08:36 +08: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
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
TreeHugger Robot
4a76598ba5 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev 2020-03-02 13:56:51 +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
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
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
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
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
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
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
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
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
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
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
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
Automerger Merge Worker
91f7309d5d Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 
Change-Id: I7da82152579dd6934937881fecb28ea056fd5937
 2020-02-29 05:39:01 +00:00
TreeHugger Robot
9229504fe2 Merge "Fix notification history crash & layout" into rvc-dev 2020-02-29 05:23:07 +00:00
Automerger Merge Worker
bf69895603 [automerger skipped] DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master am: 9fe7d6c59b -s ours 
am skip reason: subject contains skip directive

Change-Id: I5c3fb50f656ded58064ae0e18424ea9f9b0ba429
 2020-02-29 04:20:58 +00:00
Julia Reynolds
291ee404c2 Fix notification history crash & layout 
- Fix occasional crash on device boot
- No more overlapping text

Test: manual
Fixes: 150326599
Fixes: 149767075
Change-Id: I3032a2913f2ca4ce57af596c180faa819e4c9363
 2020-02-28 16:16:44 -05:00
Quang Luong
834b0ade20 [WifiSettings2] Remove redundant save() call for new configs 
Removing call to WifiManager#save() when configuring a new network
through tapping it in the wifi picker. Since WifiManager#connect()
already saves the passed in WifiConfiguration, the call to
WifiManager#save() is redundant.

Bug: 149579116
Test: build, manual verification by connecting to a new secure network
Change-Id: I9242e7fd7e9a459e8221b6bb491ab67833970e87
 2020-02-28 12:58:36 -08:00
Automerger Merge Worker
47efc875da Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec 
Change-Id: Iead26d883a75dc45269a9f060ea74a6b8aae3084
 2020-02-28 16:55:59 +00:00
Sarah Chin
f7fe2b0dec Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev 2020-02-28 16:48:41 +00:00
Automerger Merge Worker
31899646f8 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 
Change-Id: Ia318c314d726f84aea16427b50ffb2f569ad44ef
 2020-02-28 16:22:49 +00:00
TreeHugger Robot
fc2939ddd1 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev 2020-02-28 16:14:33 +00:00
Automerger Merge Worker
767b00a6e8 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b 
Change-Id: Ie36ad2199d53acaf7beb9ccbfdee374c1676c391
 2020-02-28 15:46:31 +00:00
Automerger Merge Worker
48823ea702 Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 
Change-Id: Ie244a4c73d7724acb84f6e77f6609d2d9f2d665f
 2020-02-28 15:34:24 +00:00
TreeHugger Robot
c2153e244b Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev 2020-02-28 15:33:44 +00:00
Shafik Nassar
3071821207 Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev 2020-02-28 15:30:58 +00:00
Automerger Merge Worker
50637d69b9 [automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours 
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: I0e6d4e125ff32fc9afb1fb46ee279a5aee7a3ce2
 2020-02-28 06:28:30 +00:00
Automerger Merge Worker
fe066eab8d [automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours 
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: Ie5c75f89bb59471650fbc4dbabfc85cf8f64b45e
 2020-02-28 06:16:47 +00:00