PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,270 Commits 1 Branch 0 Tags
04208f16b02c793f52b8c04d41799f79f286b056
Commit Graph

28270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raff Tsai
04208f16b0 Do not allow draw on top for App notification settings 
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f)
 2019-05-03 12:14:35 +08:00
Android Build Merger (Role)
d6bde3f5b8 [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 
Change-Id: I16c54cab9346d161d668dc4183ae4a9eb7117996
 2019-02-20 21:54:39 +00:00
Android Build Merger (Role)
7926131837 [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 
Change-Id: I9212ffd96f974268c0069e80e68347102967e7e5
 2019-02-20 21:54:37 +00:00
Android Build Merger (Role)
7a58589114 [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f 
Change-Id: Ic6e4308ee65a83e7d00801452323569301e65d66
 2019-02-20 21:54:34 +00:00
Android Build Merger (Role)
b810aee20f [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 
Change-Id: I9466105a6de960efb4513d4e856450459aec2560
 2019-02-20 21:54:31 +00:00
Fan Zhang
95d0fb7f49 Do not allow draw on top for default sms picker. 
Fixes: 120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit 9d46e1fdfe)
 2019-02-20 13:53:51 -08:00
TreeHugger Robot
8e20b46f3f Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into nyc-mr2-dev 
* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
  DO NOT MERGE Disable changing lock when device is not provisioned.
 2018-08-09 18:43:34 +00:00
TreeHugger Robot
f0d84f0841 Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into cw-f-dev 
* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
  DO NOT MERGE Disable changing lock when device is not provisioned.
 2018-08-09 18:43:34 +00:00
TreeHugger Robot
597820a687 Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into nyc-mr1-dev 2018-08-09 18:43:34 +00:00
TreeHugger Robot
20a8f8b1ae Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into nyc-mr2-dev 
* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5
  DO NOT MERGE Disable changing lock when device is not provisioned.
 2018-08-09 18:34:12 +00:00
Android Build Merger (Role)
1b622b07be [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6 
Change-Id: I9c1ba2599a78d6518531a2bff2b899eecb3b6554
 2018-08-03 21:04:09 +00:00
Android Build Merger (Role)
aaa67659a6 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 
Change-Id: Ic801ec29d08cf8600e3f04cd9b311d6fbbb315a8
 2018-08-03 21:04:08 +00:00
Android Build Merger (Role)
782fc16dc4 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 
Change-Id: If73d439ccad4d5a317de59de48427e6f406f1fa2
 2018-08-03 21:04:06 +00:00
Android Build Merger (Role)
c056ac3011 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 
Change-Id: I8b74b9105db55d8b8cdb3f7bc7b8b42ee9998de8
 2018-08-03 21:04:04 +00:00
Doris Ling
c624deaff5 DO NOT MERGE Disable changing lock when device is not provisioned. 
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
 2018-08-03 14:03:37 -07:00
Android Build Merger (Role)
3503445e59 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7 
Change-Id: I67d4821190d4a6283a54a23a087984b9ca18063f
 2018-08-03 01:03:02 +00:00
Android Build Merger (Role)
d98908e7c7 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f 
Change-Id: If3f680b663909bd4e40b3e9033fed9cd0c8f537a
 2018-08-03 01:03:00 +00:00
Doris Ling
cd0b97e86f DO NOT MERGE Disable changing lock when device is not provisioned. 
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
 2018-08-03 01:02:58 +00:00
Doris Ling
94ea2dad5b DO NOT MERGE Disable changing lock when device is not provisioned. 
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
 2018-08-02 18:00:29 -07: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
263b3861cb Merge "Merge translations of Bluetooth confirmation text" into nyc-dev 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
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
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
Android Build Merger (Role)
b9aa0fbfe9 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead 
Change-Id: I164f89c547721b6b02fcd2bf57b224c92816e25b
 2018-05-24 18:22:35 +00:00
Android Build Merger (Role)
30d0145ead [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e 
Change-Id: I72e34eb278333a310cab6845c79f55df50478860
 2018-05-24 18:22:34 +00:00
Android Build Merger (Role)
93ee1bd17e [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f 
Change-Id: Ic7873dae0f097a546b250ebcb96cf88a437e1173
 2018-05-24 18:22:33 +00:00
Android Build Merger (Role)
551be9a85f [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f 
Change-Id: Ibb61117b7475504a756dafece07c5d79eba0f73f
 2018-05-24 18:22:32 +00:00
Android Build Merger (Role)
874c51780f [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 
Change-Id: Ieb0dfe22926f14109466bd00c9cac9ccaa04e057
 2018-05-24 18:22:30 +00:00
Android Build Merger (Role)
cb66517282 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 
Change-Id: I2b731c3a29f4fde5a672c9224008e7be7e460b72
 2018-05-24 18:22:29 +00:00
Android Build Merger (Role)
5b4de5e724 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d 
Change-Id: I1ba9495afe9e105926ad407442d732f2c6e92cf5
 2018-05-24 18:22:19 +00:00
Antony Sargent
e0eeafcb5d 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: Iab08b43768f0aedd690570eb59dcb71c14c04784
 2018-05-23 18:02:36 +00:00
Antony Sargent
732b65ca4d 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
 2018-05-21 15:14:25 -07:00
Android Build Merger (Role)
108cb3edaa [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a 
Change-Id: I8bb2f283f86210447788c3191b67c1936e7b0a72
 2018-05-21 22:05:41 +00:00
Antony Sargent
a0b8f3fe3a 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: I049138002f07e78442ddebfa746d6128b5689947
 2018-05-21 14:43:18 -07:00
Android Build Merger (Role)
c874b450af [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 
Change-Id: Iacafdefee68a900d636db83ccbf764114327a805
 2018-05-21 21:00:04 +00:00
Android Build Merger (Role)
e9345782e2 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 
Change-Id: Ia02c7c5d5e52abcd2ecfbf0d9399efad31c3575e
 2018-05-21 21:00:03 +00:00
Android Build Merger (Role)
7304aaf293 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf 
Change-Id: I1fa52208a183a67c694c9457bb304f94c1a05ec1
 2018-05-21 21:00:01 +00:00