PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,350 Commits 1 Branch 0 Tags
99e388613d5ce79ad0038ceedc79ffdc9c357bbc
Commit Graph

47350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Atanas Kirilov
48fd185e3b Merge "Merge translations of Bluetooth confirmation text" into nyc-mr2-dev 2018-06-04 20:24:35 +00:00
Atanas Kirilov
438cf9da52 Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 732b65ca4d
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:34 +00:00
Atanas Kirilov
9e626734bb Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b skipped: 3e48235bf6
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:25 +00:00
Atanas Kirilov
b6f0ef4113 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into nyc-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:25 +00:00
Atanas Kirilov
c202a94028 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into cw-f-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:25 +00:00
Atanas Kirilov
07bcf55ae8 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into nyc-mr1-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:25 +00:00
Atanas Kirilov
ae16bd77c3 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into nyc-dr1-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:25 +00:00
Atanas Kirilov
9de0f72681 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into nyc-mr2-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:25 +00:00
Atanas Kirilov
826b14e43e Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev 
* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead skipped: b9aa0fbfe9
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d
  Merge translations of Bluetooth confirmation text
 2018-06-04 20:24:19 +00:00
Fan Zhang
7c1233116b Clean up some search nonIndexableKeys. 
- Make the entire gesture setting page unsearchable. This is safe
  because each row in gesture setting page lead to a child page, we are
  only removing duplicates.
- Make the pref controller for System -> gesture return
  AVILABLE_UNSEARCHABLE so it's also suppressed.
- Suppres the parent page for adaptive brightness.

Bug: 72748524
Test: manual
Change-Id: Id7317f5f126af88b1bde8d87b8a206d9909df904
 2018-06-04 18:50:44 +00:00
Bill Yi
0614f76677 [automerger skipped] Import translations. DO NOT MERGE am: d9bd267146 -s ours 
am: 170d5415bc  -s ours

Change-Id: I5adca8586469006ca8b38f0849335d2a9325658a
 2018-06-04 11:26:33 -07:00
Antony Sargent
ba8ae71025 Merge translations of Bluetooth confirmation text 
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I829baada46cdb2314021d8772feb8811072e41d8
Merged-In: I2d8c57680d1d98b74193654e9fe77016304f6ac5
 2018-06-04 18:05:34 +00:00
Shuzhen Wang
8f9fc06a18 Revert "Settings: Add logical camera default switch" 
This reverts commit a9578a2b8a.

Test: Build
Bug: 80007047
Merged-In: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
 2018-06-04 17:37:25 +00:00
TreeHugger Robot
04af70a604 Merge "Revert "Settings: Add logical camera default switch"" 2018-06-04 17:35:57 +00:00
Android Build Merger (Role)
80381d7ff8 [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e am: e20b700ac1 
Change-Id: Ib56a32b88c58c7b1a54ba4522cd9bf4bd80cd6e5
 2018-06-04 17:23:18 +00:00
Android Build Merger (Role)
e20b700ac1 [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e 
Change-Id: Ib1f576348a4e89028ddb3d731ecdc1c92599723d
 2018-06-04 17:23:16 +00:00
Android Build Merger (Role)
b176eaa85e [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa 
Change-Id: I0d88fc2ba7016327ab0ebbe05b016c4585ee965f
 2018-06-04 17:23:08 +00:00
Bill Yi
170d5415bc [automerger skipped] Import translations. DO NOT MERGE 
am: d9bd267146  -s ours

Change-Id: I40fc59c193077ee76cf2e1a47e8039ef08df123f
 2018-06-04 10:12:58 -07:00
Bill Yi
d9bd267146 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7d788703ce218cc211305bf078fde78ce7dde2af
 2018-06-03 14:55:40 -07:00
TreeHugger Robot
e763ebcba1 Merge "Add Wifi calling Preference slice and other cleanup" 2018-06-01 22:32:11 +00:00
TreeHugger Robot
4661045f2c Merge "Add Slices for Enhanced 4G LTE" 2018-06-01 21:28:11 +00:00