PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,029 Commits 1 Branch 0 Tags
f6aad2aee8b5498b62fb8bf8b51bfef1945fae9f
Commit Graph

46029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
android-build-team Robot
78aa410a4a Snap for 4818837 from d9bd267146 to pi-release 
Change-Id: I3ec942fd2e7c035929d65229220f20017175f888
 2018-06-04 07:23:07 +00: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
android-build-team Robot
2b28a219d6 Snap for 4818534 from 8c56825ecd to pi-release 
Change-Id: Iec88470ae82ce808e46985adf182cead5eec5d61
 2018-06-03 07:27:44 +00:00
Bill Yi
5236bf8780 [automerger skipped] Import translations. DO NOT MERGE 
am: 8c56825ecd  -s ours

Change-Id: I3a9cfd19929f45a1d551c2e09d5b7e67103a89aa
 2018-06-01 11:19:28 -07:00
Bill Yi
8c56825ecd Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I67611d91d92e62641467382da0079497eb5dcd06
 2018-05-31 22:05:33 -07:00
Ryan Lin
15eb7fe8c4 Merge "Handle Bluetooth is not supported on emulator" into pi-dev 
am: 942b07da93

Change-Id: I9977e19cc055effe3c9ce91a2665462957a97481
 2018-05-31 17:16:12 -07:00
Ryan Lin
942b07da93 Merge "Handle Bluetooth is not supported on emulator" into pi-dev 2018-05-31 23:22:30 +00:00
Beverly
60d57976bc Merge "No need for "and" - ListFormatter adds it" into pi-dev 
am: fa01fcb2c9

Change-Id: If899d486356937f740a959f1ca6d94b8675d857a
 2018-05-31 14:24:11 -07:00
Matthew Fritze
2c7fe6f8ea Merge "Make Settings Slider Slices one row" into pi-dev 
am: 4199198ec2

Change-Id: I3716adf421c539c4a4f0617a5ab8d1a1f89e7cbc
 2018-05-31 11:37:19 -07:00
TreeHugger Robot
fa01fcb2c9 Merge "No need for "and" - ListFormatter adds it" into pi-dev 2018-05-31 18:12:00 +00:00
TreeHugger Robot
4199198ec2 Merge "Make Settings Slider Slices one row" into pi-dev 2018-05-31 16:03:25 +00:00
Beverly
ab5a016e26 No need for "and" - ListFormatter adds it 
Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes: 80303010
 2018-05-31 09:32:26 -04:00
Chalard Jean
2583a7bffc Use the SSID of the network in the no internet dialog 
Bug: 77865258
Test: manual & roboelectric
Change-Id: I72f1f74bf004f30a2c38b4c3af977ff09360d1e8
 2018-05-31 16:51:38 +09:00
android-build-team Robot
6b88d6be75 Snap for 4813226 from acfbc0eff4 to pi-release 
Change-Id: I9ced22149e80ae7a8fdd08ed0f0649cef5081be3
 2018-05-31 07:27:50 +00:00
ryanywlin
d67314e771 Handle Bluetooth is not supported on emulator 
- Disable audio swicher while Bluetooth feature is not supported
- Error handle before using LocalBluetoothManager in the constructor

Bug: 80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42

Change-Id: I971f31cd08dd0a2778548f6d1d675f279d92ef8e
 2018-05-31 12:48:13 +08:00
Matthew Fritze
93307cdb69 Make Settings Slider Slices one row 
To unify all Settings slices into one row, we change
Settings Slider from user a header and a input range to
only using an Input Range.

Change-Id: I61715a45b29b6a52a47711811e5c6b2c83d50901
Fixes: 80430118
Test: robotests
 2018-05-30 15:39:43 -07:00
Hansong Zhang
6197f671b2 [automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 am: 7cc441bf2f -s ours 
am: acfbc0eff4

Change-Id: If3486b74a7b37cf12637aabeeece719c9567093a
 2018-05-30 13:59:15 -07:00
Hansong Zhang
acfbc0eff4 [automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 
am: 7cc441bf2f  -s ours

Change-Id: I19de0cbe315d298550edfb85039fbc87c42e6dc6
 2018-05-30 13:41:41 -07:00
Hansong Zhang
7cc441bf2f DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d 
am: 48aa959b14

Change-Id: I13480b0bf786ddd05959cb597492041e273d920c
 2018-05-30 13:32:52 -07:00
Hansong Zhang
48aa959b14 DO NOT MERGE Give PBAP permission only after user confirms 
am: e36ca3e96d

Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d
 2018-05-30 13:23:53 -07:00
Hansong Zhang
cd09ff50bb Merge "Give PBAP permission only after user confirms" into pi-dev 
am: fcac34d723

Change-Id: I96b3a2f59ff77d646c641043428db673eaaf2653
 2018-05-30 10:41:35 -07:00
TreeHugger Robot
fcac34d723 Merge "Give PBAP permission only after user confirms" into pi-dev 2018-05-30 17:35:57 +00:00
android-build-team Robot
ecdc56419d Snap for 4810559 from cf2e1fd593 to pi-release 
Change-Id: I1de4fc4bb46e0815a23cf5601fc212b793b2ded0
 2018-05-30 07:27:12 +00:00
Fan Zhang
4a337db847 Merge "Plumb context object to PowerWhitelistBackend." into pi-dev 
am: cf2e1fd593

Change-Id: I7d3b2321d9cc3c44dea3738596104df2e43cb1f3
 2018-05-29 20:20:55 -07:00
TreeHugger Robot
cf2e1fd593 Merge "Plumb context object to PowerWhitelistBackend." into pi-dev 2018-05-30 03:08:20 +00:00
Fan Zhang
85d843f72d Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev 
am: ce7d1ab3bb

Change-Id: I57a3b66ba8b4c84b7407ada5e1d754b49d85e61a
 2018-05-29 18:01:02 -07:00
TreeHugger Robot
ce7d1ab3bb Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev 2018-05-30 00:18:45 +00:00
Fan Zhang
3489f65024 Plumb context object to PowerWhitelistBackend. 
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Merged-In: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests
 2018-05-29 22:33:01 +00:00
Fan Zhang
9ab2f37226 Prevent disabling default phone/sms apps in battery setting 
- In handleDisableable(), call getKeepEnabledPackages() in the same way
  as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
  app packages.

Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Merged-In: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Fixes: 80328396
Bug: 80312809
Test: robotests
 2018-05-29 22:25:56 +00:00
Hansong Zhang
500c83c1bc Give PBAP permission only after user confirms 
Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
 2018-05-29 22:15:51 +00:00
Matthew Fritze
9cb3dd123d Merge "Fix bluetooth search result no-op" into pi-dev 
am: f14bfcbfa6

Change-Id: Ie4340134a533c9dcd3293e5fc4f7d5d14fb5a3bb
 2018-05-29 12:51:39 -07:00