Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,332 Commits 1 Branch 0 Tags
cc75d0e2d9e2ca3a6e7e2fcb6bfdc44e02ed4532
Commit Graph

27350 Commits

Author SHA1 Message Date
Arc Wang
cc75d0e2d9 Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c am: 3e39f94880 
am: 842b421420

Change-Id: I1dba808a58d55e72259a048d6cb760fe286df054
 2019-05-24 16:51:24 -07:00
Beverly
289ae65a27 Merge "Add ability to adjust height of VideoPreference" into qt-dev am: d5daa47be8 am: 3f5d795953 
am: 6cc9f36ba9

Change-Id: Icd9bada3252ca291af3070fffc31efea79f44cc5
 2019-05-24 16:50:57 -07:00
Steve Elliott
edf253fef6 Merge "Add entry point to global actions panel settings" into qt-dev am: 4b5d31fe67 am: d5c5c8ab9f 
am: b136e0a5ce

Change-Id: I2ffbf354700bd1f638226dd2c7713e8f27210fd5
 2019-05-24 16:50:16 -07:00
Joshua Mccloskey
3c4c3a4783 Merge "Added different button for non SUW enrollment" into qt-r1-dev am: d9db8cb608 
am: a26dd34be7

Change-Id: I17425b4585c99fdff8f790056b7f1ce536ee0c5b
 2019-05-24 16:43:10 -07:00
Lei Yu
73039e0cbc Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1 am: 52c51fd26f 
am: b46410688f

Change-Id: If4638ce9bf53d839bb5c489a740372a538a41ca3
 2019-05-24 16:42:23 -07:00
Varun Shah
783985296f Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d am: dfdac2d9e0 
am: b4432823ee

Change-Id: I331c704139f2c50a1310c88d00683edf92d494d7
 2019-05-24 16:42:10 -07:00
Evan Laird
cf0aed22e3 Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9 am: 2915d75658 
am: f1c7caf747

Change-Id: Id04b755f78309391ce5400c3734ac76f683671b2
 2019-05-24 16:41:37 -07:00
Joshua Mccloskey
f5857f907f Merge "Reduced time to 3 seconds." into qt-r1-dev am: da74cc8cc7 
am: 0e568fbb1a

Change-Id: I4a01c202b1b881b7ac1a01863e3ebdae05ec10f3
 2019-05-24 16:41:23 -07:00
Mady Mellor
1fa11a8c37 Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2 am: 4740a76fd4 
am: 34c7eac424

Change-Id: I64398601c3d1f37a124c04f4e042a34ae1c45673
 2019-05-24 16:36:57 -07:00
Mady Mellor
b63290ea2e Merge "Make sure the fragment manager is passed to BubblePreferenceController" into qt-dev am: 0b37ea8b6d am: 03e5e847f7 
am: f0da39b736

Change-Id: Ie7dc12aa1a296af91ae7b623f6e61bb48848d39c
 2019-05-24 16:36:39 -07:00
tmfang
28e0a07e45 Merge "Fix overlapping problem on wifi detail screen" into qt-dev am: f59844570e am: 9b9359547c 
am: cb2f916eac

Change-Id: Ic3fe2bf224bd09b7c3b1bdc66badea1adee6ab02
 2019-05-24 16:36:07 -07:00
Alan Stokes
81ddb45922 Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d am: 5b1b45b498 
am: 9a17e6265a

Change-Id: I24459012f6a6a0b4e3265d36423bed9cafa20d3e
 2019-05-24 06:50:21 -07:00
Stanley Wang
69f6d559b0 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3 am: 69893f95ae 
am: 09dbc29187

Change-Id: I94a03587188d833536b13627776ba9c44af77492
 2019-05-24 06:48:04 -07:00
Pasty Chang
ecbc4e524f Merge "Apply stencil theme for description textview" into qt-dev am: 6746e15859 am: 1b4965583f 
am: 7fef0c3b9b

Change-Id: I8becd16e32705caa22335a17321661e45942a4bc
 2019-05-24 06:46:08 -07:00
Lei Yu
f945851e79 Merge "Update logic to build slider slice" into qt-dev am: 8866301b83 am: 1131a1e0d7 
am: fc58ee09fb

Change-Id: I5f9cafd727000d9e9042aa2075ad05b235d33aff
 2019-05-24 06:44:06 -07:00
lindatseng
fa23a8b1f2 Merge "Add null check to precent crash in monkey test" into qt-dev am: 99162f2a35 am: b84816d05b 
am: e204110910

Change-Id: I9fcfadf2cb02338b780e662ec4315a77ec50bf53
 2019-05-24 06:39:30 -07:00
Julia Reynolds
642f5aeee8 Merge "Config notifs page updates" into qt-dev am: 1c83c08289 am: 4679c46a8a 
am: 7528ab396e

Change-Id: Iecf21ae784fcf82b31a7ccbf4fe52e8950709996
 2019-05-24 06:38:22 -07:00
Alexey Kuzmin
584613d784 Merge "Add a clarifying comment" into qt-dev am: b1e4072518 am: 0d97074f05 
am: 4fc9f55bc2

Change-Id: I1236739df98e42e6ef91fb3b6d54e9a2b8fe914b
 2019-05-24 06:35:22 -07:00
Mill Chen
2321b1037f Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev am: ef0f8a4dab am: 388cca892a 
am: fa23fcc795

Change-Id: Ic888037f538b15935e69149d01cfd8fa2eb31dbc
 2019-05-24 06:30:15 -07:00
Shuo Qian
0da520c161 Merge "Add AutoCancel Notification UI for sim change" into qt-dev am: 2d2b224a09 am: 89f9e91075 
am: e73593af34

Change-Id: Ie2e3ec993c13f0daaecca220bb1623037b70fd71
 2019-05-24 02:35:00 -07:00
Arc Wang
842b421420 Merge "Fix Wi-Fi QR code decode fail" into qt-dev am: 27d09aeb0c 
am: 3e39f94880

Change-Id: I53350e526743e3fb4597eabe04af9ec54f74a0e2
 2019-05-23 23:15:05 -07:00
Yiwen Chen
2dd7a569bb Merge "Keep consistency between sound and accessibility settings." into qt-dev am: 6843e0247a 
am: 7176ddc247

Change-Id: Ib04c4b59431a55a445167bcb8aa7de9812d03d21
 2019-05-23 22:57:19 -07:00
Beverly
6cc9f36ba9 Merge "Add ability to adjust height of VideoPreference" into qt-dev am: d5daa47be8 
am: 3f5d795953

Change-Id: Idb654d1583253092456a01ed63b1329618a424fb
 2019-05-23 22:55:06 -07:00
Steve Elliott
b136e0a5ce Merge "Add entry point to global actions panel settings" into qt-dev am: 4b5d31fe67 
am: d5c5c8ab9f

Change-Id: I0d80057b84e77eb9cad12a11c3d61ab1a8ab6870
 2019-05-23 22:34:15 -07:00
Joshua Mccloskey
a26dd34be7 Merge "Added different button for non SUW enrollment" into qt-r1-dev 
am: d9db8cb608

Change-Id: I56dced9ce66b018d51e4f616f5f769246fa2bc75
 2019-05-23 22:20:24 -07:00
Arc Wang
3e39f94880 Merge "Fix Wi-Fi QR code decode fail" into qt-dev 
am: 27d09aeb0c

Change-Id: If4e777dba0ed9c127d66566a510713534a951ddd
 2019-05-23 22:16:25 -07:00
Yiwen Chen
7176ddc247 Merge "Keep consistency between sound and accessibility settings." into qt-dev 
am: 6843e0247a

Change-Id: I21da5bf92dcdd6be217ddb9db4b0f81423f484c7
 2019-05-23 22:15:11 -07:00
Beverly
3f5d795953 Merge "Add ability to adjust height of VideoPreference" into qt-dev 
am: d5daa47be8

Change-Id: Iee281a8eeecd9dab5fff117a5035daa8440628e3
 2019-05-23 22:14:04 -07:00
Steve Elliott
d5c5c8ab9f Merge "Add entry point to global actions panel settings" into qt-dev 
am: 4b5d31fe67

Change-Id: Ia1df945feebe39f875a041d243e26abaf6c41fe2
 2019-05-23 22:09:49 -07:00
Joshua Mccloskey
d9db8cb608 Merge "Added different button for non SUW enrollment" into qt-r1-dev 2019-05-24 02:36:54 +00:00
Arc Wang
27d09aeb0c Merge "Fix Wi-Fi QR code decode fail" into qt-dev 2019-05-24 01:56:42 +00:00
Yiwen Chen
6843e0247a Merge "Keep consistency between sound and accessibility settings." into qt-dev 2019-05-24 01:24:52 +00:00
Yiwen Chen
85580fbc88 Keep consistency between sound and accessibility settings. 
Bug: 130741987
Test: Tested on device
Change-Id: Id6dd485c73f9453970b8d79929ffc04acb2c76c8
(cherry picked from commit 494071463b)
 2019-05-24 01:24:35 +00:00
TreeHugger Robot
d5daa47be8 Merge "Add ability to adjust height of VideoPreference" into qt-dev 2019-05-24 01:19:59 +00:00
TreeHugger Robot
4b5d31fe67 Merge "Add entry point to global actions panel settings" into qt-dev 2019-05-24 01:14:40 +00:00
Lei Yu
b46410688f Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1 
am: 52c51fd26f

Change-Id: I884be341b204703fcd11a4617bcfba5bdc248231
 2019-05-23 15:49:16 -07:00
Varun Shah
b4432823ee Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d 
am: dfdac2d9e0

Change-Id: Ibe5d8454e2bf7a8baa5abf17336db3bfa2db7517
 2019-05-23 15:37:05 -07:00
Lei Yu
52c51fd26f Merge "Hide network select in some situations" into qt-dev 
am: 2bdf358cd1

Change-Id: I9266a78be96e48d68cce94969601735013a021c7
 2019-05-23 14:38:47 -07:00
Varun Shah
dfdac2d9e0 Merge "Update design for Family Link supervision enrollment dialog." into qt-dev 
am: 4e27d29e6d

Change-Id: I25af902f0a0f94faa8f89edf85a6657c11d6ea9d
 2019-05-23 14:21:17 -07:00
Evan Laird
f1c7caf747 Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9 
am: 2915d75658

Change-Id: I3eb6858274aab0eea0b57e54170ab51d07ec726a
 2019-05-23 14:02:43 -07:00
Evan Laird
2915d75658 Merge "Remove gentle/alerting icons from channel settings" into qt-dev 
am: 535f0489c9

Change-Id: I72d23c40798d3098391f51bd5f8c750cbaf97569
 2019-05-23 13:38:03 -07:00
Evan Laird
81141a5918 Merge "Remove gentle/alerting icons from channel settings" into qt-dev 
am: 535f0489c9

Change-Id: I6925501e09124c1b6907f599254db0ea7adbc4ac
 2019-05-23 13:36:17 -07:00
Joshua Mccloskey
0e568fbb1a Merge "Reduced time to 3 seconds." into qt-r1-dev 
am: da74cc8cc7

Change-Id: I91b7948e9efc55a9a5d4e6234cc384dd4df786be
 2019-05-23 13:34:53 -07:00
Lei Yu
2bdf358cd1 Merge "Hide network select in some situations" into qt-dev 2019-05-23 20:28:38 +00:00
joshmccloskey
cf8e9af588 Added different button for non SUW enrollment 
Bug: 133416320
Test: Manual.
Change-Id: I7087d5d4aa8f41e8d357f6fb41774d1bc62c17d9
 2019-05-23 13:19:00 -07:00
Joshua Mccloskey
da74cc8cc7 Merge "Reduced time to 3 seconds." into qt-r1-dev 2019-05-23 19:44:31 +00:00
TreeHugger Robot
4e27d29e6d Merge "Update design for Family Link supervision enrollment dialog." into qt-dev 2019-05-23 19:17:27 +00:00
TreeHugger Robot
535f0489c9 Merge "Remove gentle/alerting icons from channel settings" into qt-dev 2019-05-23 18:17:46 +00:00
Lei Yu
2bf8806740 Hide network select in some situations 
Hide network select when:
1. NETWORK_MODE_LTE_CDMA_EVDO && worldMode
2. 6 NETWORK_MODE && worldMode && !Tdscdma

Also update GSM/CDMA check since it was only include 1 network mode,
not 6 modes.

Fixes: 131126607
Test: RunSettingsRoboTests
Change-Id: I28782778827ced7d9f24d527d52399e2b544109e
 2019-05-23 09:56:28 -07:00
Mady Mellor
34c7eac424 Merge "App Bubble control page should always be available, even if off globally" into qt-dev am: f7f1dd37c2 
am: 4740a76fd4

Change-Id: I1939a419fccc83943f4297595d1400378017ccba
 2019-05-23 08:07:12 -07:00