PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,971 Commits 1 Branch 0 Tags
6ac8d80fcb55fa2e20d5fa1a53083d2bc1129abc
Commit Graph

47971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4d142c992b Merge "Add null check in displayPreference" 2018-06-05 18:14:17 +00:00
Beverly
b77145401f Add null check in displayPreference 
Change-Id: I3afaa3f587dc5c9989d5e520f1c8a0b33e57ec7d
Fixes: 109740402
Test: ZenModeStarredContactsPreferenceControllerTest.java
 2018-06-05 13:05:12 -04:00
Atanas Kirilov
6ffc5c43b2 [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours am: 71046c3d10 -s ours am: bed0aff4a2 -s ours 
am: 5a996aa7fe  -s ours

Change-Id: I577577163a1bc9d1ecf47f3c90e25c54b3348cbc
 2018-06-04 18:57:37 -07:00
Atanas Kirilov
e190f40dae Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3 am: 5e66879b53 am: 128334d2c6 
am: 8006c6a726

Change-Id: I6b7b04980efc8b73b9e974bcfe0dcf8b7a7d437a
 2018-06-04 18:51:33 -07:00
Atanas Kirilov
5573ff9140 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1 am: 463ea747f6 am: 25bd78d7e9 
am: f97fc8eb17

Change-Id: Icad7d221f2735510a3e3ae1610ba39305c0e8b07
 2018-06-04 18:49:11 -07:00
Atanas Kirilov
1582b6450a Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778 am: 0d59c0d23d am: a6b728c5a3 
am: dabefd5d43

Change-Id: If4a1f9e46ea994b1c98cc9e0ffcca987e85d5ca1
 2018-06-04 18:40:28 -07:00
Atanas Kirilov
aa05ba6b6f Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9 am: 2f38890832 am: 5dfb976b21 
am: c114a65956

Change-Id: I35673a6e6bedfa2e5c0599883766db96e6561c44
 2018-06-04 18:31:55 -07:00
Atanas Kirilov
0ab302bc3a Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3 am: a50293f72c am: f2a135ec5a 
am: 224968eebd

Change-Id: I5f746f3ac87a3febe343667a890fb73e2b719bdd
 2018-06-04 18:19:38 -07:00
Atanas Kirilov
5a996aa7fe [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours am: 71046c3d10 -s ours 
am: bed0aff4a2  -s ours

Change-Id: I67fcc4599901d226a6170c0c9c08ac3c0ff655bb
 2018-06-04 18:17:44 -07:00
Atanas Kirilov
8006c6a726 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3 am: 5e66879b53 
am: 128334d2c6

Change-Id: If905b3299ca2e05602e2f82d3e85f20ebdddf48f
 2018-06-04 17:47:54 -07:00
Atanas Kirilov
f97fc8eb17 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1 am: 463ea747f6 
am: 25bd78d7e9

Change-Id: I05dc984a6c0cd5f69d4dc47e33385fa77469ae17
 2018-06-04 17:46:21 -07:00
Atanas Kirilov
dabefd5d43 Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778 am: 0d59c0d23d 
am: a6b728c5a3

Change-Id: Ibfc308478a04405fb108299da7e2aaab6857c9d3
 2018-06-04 17:41:57 -07:00
Atanas Kirilov
bed0aff4a2 [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours 
am: 71046c3d10  -s ours

Change-Id: If9297fdc320c747d213dc81b4639e7c9f76cdedf
 2018-06-04 17:41:55 -07:00
Atanas Kirilov
c114a65956 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9 am: 2f38890832 
am: 5dfb976b21

Change-Id: I151b3bdedebdfdef0f6358b4a0315150521b85bf
 2018-06-04 17:31:09 -07:00
Atanas Kirilov
224968eebd Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3 am: a50293f72c 
am: f2a135ec5a

Change-Id: Ifd13e7ffb4e632538aef51102b7f151777b7b626
 2018-06-04 17:18:51 -07:00
Atanas Kirilov
71046c3d10 [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours 
am: b072779789  -s ours

Change-Id: I517819e05e5283e6c50555c713d79b34179a4f7c
 2018-06-04 17:10:35 -07:00
Shuzhen Wang
cca6aac897 [automerger skipped] Merge "Revert "Settings: Add logical camera default switch"" into pi-dev am: 1db4027355 
am: 7ed1343d0a  -s ours

Change-Id: Icddc5ec3a2d031c0021d4983952569b9aecb0b23
 2018-06-04 17:06:26 -07:00
Atanas Kirilov
b072779789 [automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev 
am: 8994d1f0a4  -s ours

Change-Id: I91de7cf39aee69aab379cfd81085965cabf0ae81
 2018-06-04 16:59:14 -07:00
Atanas Kirilov
128334d2c6 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3 
am: 5e66879b53

Change-Id: Ib02ca4cd840e86f0287c5b02f45419b894f044ea
 2018-06-04 16:46:48 -07:00
Atanas Kirilov
25bd78d7e9 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1 
am: 463ea747f6

Change-Id: I059ddf801b8cc60d78b209b37af37db25c049b5f
 2018-06-04 16:45:39 -07:00
Atanas Kirilov
a6b728c5a3 Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778 
am: 0d59c0d23d

Change-Id: Ie2cfc61ddd94e49a6794bf08949b3a60f4ee98df
 2018-06-04 16:42:39 -07:00
Atanas Kirilov
5dfb976b21 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9 
am: 2f38890832

Change-Id: I9532ffd77827da2ee932e150d6f75c4022a8bba9
 2018-06-04 16:41:45 -07:00
Atanas Kirilov
f2a135ec5a Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3 
am: a50293f72c

Change-Id: I20749db43dcab2085bcb9733601000cd96be14ce
 2018-06-04 16:40:10 -07:00
Atanas Kirilov
5e66879b53 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 
am: dededea9f3

Change-Id: Ia42df7f876f964d153b217de4f501a0b7f03d363
 2018-06-04 16:14:11 -07:00
Atanas Kirilov
463ea747f6 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 
am: 67892acff1

Change-Id: I4ca44d469bf063ba68b078ba830a5b7f4d86a2cb
 2018-06-04 16:13:02 -07:00
Atanas Kirilov
0d59c0d23d Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 
am: a29108a778

Change-Id: I24bdca64cf308155ae9499fc0db629ba31c85e90
 2018-06-04 16:10:32 -07:00
Atanas Kirilov
2f38890832 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb 
am: 65db9c47b9

Change-Id: I86cff1a6b90fbf53738d76f26fee07637db7da95
 2018-06-04 16:09:33 -07:00
Atanas Kirilov
a50293f72c Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e 
am: 74d98110f3

Change-Id: Ie334ee442e46dffa11926b471b0a096a3c4f1f92
 2018-06-04 16:07:36 -07:00
Shuzhen Wang
7ed1343d0a Merge "Revert "Settings: Add logical camera default switch"" into pi-dev 
am: 1db4027355

Change-Id: I0d822607285c7b4405f6ef85cf06a029831e018f
 2018-06-04 16:06:07 -07:00
TreeHugger Robot
0e902e0d78 Merge "Suppress work-profile search terms when no AfW is on device" 2018-06-04 23:03:30 +00:00
Atanas Kirilov
dededea9f3 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev 
am: 9b4f5525b4

Change-Id: I325923e835cf57736106da3ce8cc26aefa4ee3f7
 2018-06-04 15:43:14 -07:00
Atanas Kirilov
67892acff1 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev 
am: 75f0072c94

Change-Id: Ife69a5cf4637ef6b605415c5fa9f818f2644d54c
 2018-06-04 15:41:42 -07:00
Atanas Kirilov
a29108a778 Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev 
am: 438cf9da52

Change-Id: I0964b2320f0b6d55923847bbba779bb8ee5c2794
 2018-06-04 15:39:29 -07:00
Atanas Kirilov
65db9c47b9 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev 
am: 9e626734bb

Change-Id: I6536e0423a261da7232b6229d96019fea35f5bfe
 2018-06-04 15:38:17 -07:00
Fan Zhang
3f34335e2e Suppress work-profile search terms when no AfW is on device 
- Share the same set of pref controller between main UI and search
  in AccountDashboardFragment.
- Update WorkSoundPreferenceController to actually do something for
  updateNonIndexable() method.
- LockscreenDashboardFragment to also suppress "Work notification" header. I
  think we just missed it previously.

Change-Id: Ifa6f9b2077c9810ffff33f240929f418d4a8a5aa
Fixes: 62167659
Test: robotests
 2018-06-04 22:37:42 +00:00
Atanas Kirilov
74d98110f3 Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev 
am: 826b14e43e

Change-Id: If4056f03d27f845d30862b04dcbdb119141f2bf8
 2018-06-04 15:36:29 -07:00
TreeHugger Robot
6029c63884 Merge "Clean up some search nonIndexableKeys." 2018-06-04 20:55:49 +00:00
TreeHugger Robot
1db4027355 Merge "Revert "Settings: Add logical camera default switch"" into pi-dev 2018-06-04 20:45:51 +00:00
Atanas Kirilov
8994d1f0a4 Merge "Merge translations of Bluetooth confirmation text" into oc-dev 2018-06-04 20:37:42 +00:00
Atanas Kirilov
78da279398 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into nyc-mr2-dev 
* changes:
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:25:15 +00:00
Atanas Kirilov
674371cde0 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into cw-f-dev 
* changes:
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:25:15 +00:00
Atanas Kirilov
c1028a9996 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into nyc-mr1-dev 
* changes:
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:25:15 +00:00
Atanas Kirilov
5388f7b1bc Merge "Merge translations of Bluetooth confirmation text" into nyc-dr1-dev 2018-06-04 20:25:15 +00:00
Atanas Kirilov
9b4f5525b4 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev 
* changes:
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e am: e20b700ac1
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:25:15 +00:00
Atanas Kirilov
263b3861cb Merge "Merge translations of Bluetooth confirmation text" into nyc-dev 2018-06-04 20:24:37 +00:00
Atanas Kirilov
75f0072c94 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 skipped: c874b450af
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:37 +00:00
Atanas Kirilov
a762677e27 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into nyc-mr2-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:37 +00:00
Atanas Kirilov
ec357c4782 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into cw-f-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:37 +00:00
Atanas Kirilov
84d1cc06ea Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into nyc-mr1-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:37 +00:00
Atanas Kirilov
b6f6f6db44 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into nyc-dr1-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:37 +00:00